make DestructuringPattern non-abstract

erik-krogh · erik-krogh · commit cf3f275aa126 · 2020-08-04T16:02:32.000+02:00
diff --git a/javascript/ql/src/LanguageFeatures/NonLinearPattern.ql b/javascript/ql/src/LanguageFeatures/NonLinearPattern.ql
@@ -14,9 +14,8 @@
 
 import javascript
 
-class RootDestructuringPattern extends BindingPattern {
+class RootDestructuringPattern extends DestructuringPattern {
   RootDestructuringPattern() {
-    this instanceof DestructuringPattern and
     not this = any(PropertyPattern p).getValuePattern() and
     not this = any(ArrayPattern p).getAnElement()
   }
diff --git a/javascript/ql/src/semmle/javascript/Variables.qll b/javascript/ql/src/semmle/javascript/Variables.qll
@@ -406,6 +406,8 @@ class BindingPattern extends @pattern, Expr {
   }
 }
 
+private class TDestructuringPattern = @arraypattern or @objectpattern;
+
 /**
  * A destructuring pattern, that is, either an array pattern or an object pattern.
  *
@@ -418,9 +420,9 @@ class BindingPattern extends @pattern, Expr {
  * }
  * ```
  */
-abstract class DestructuringPattern extends BindingPattern {
+class DestructuringPattern extends TDestructuringPattern, BindingPattern {
   /** Gets the rest pattern of this destructuring pattern, if any. */
-  abstract Expr getRest();
+  Expr getRest() { none() } // Overridden in subtypes.
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,8 @@`
`14`	`14`
`15`	`15`	`import javascript`
`16`	`16`
`17`		`-class RootDestructuringPattern extends BindingPattern {`
	`17`	`+class RootDestructuringPattern extends DestructuringPattern {`
`18`	`18`	`RootDestructuringPattern() {`
`19`		`- this instanceof DestructuringPattern and`
`20`	`19`	`not this = any(PropertyPattern p).getValuePattern() and`
`21`	`20`	`not this = any(ArrayPattern p).getAnElement()`
`22`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -406,6 +406,8 @@ class BindingPattern extends @pattern, Expr {`
`406`	`406`	`}`
`407`	`407`	`}`
`408`	`408`
	`409`	`+private class TDestructuringPattern = @arraypattern or @objectpattern;`
	`410`	`+`
`409`	`411`	`/**`
`410`	`412`	`* A destructuring pattern, that is, either an array pattern or an object pattern.`
`411`	`413`	`*`
`@@ -418,9 +420,9 @@ class BindingPattern extends @pattern, Expr {`
`418`	`420`	`* }`
`419`	`421`	* ```
`420`	`422`	`*/`
`421`		`-abstract class DestructuringPattern extends BindingPattern {`
	`423`	`+class DestructuringPattern extends TDestructuringPattern, BindingPattern {`
`422`	`424`	`/** Gets the rest pattern of this destructuring pattern, if any. */`
`423`		`- abstract Expr getRest();`
	`425`	`+ Expr getRest() { none() } // Overridden in subtypes.`
`424`	`426`	`}`
`425`	`427`
`426`	`428`	`/**`