use the new non-extending-subtypes syntax

Author: erik-krogh

javascript/ql/lib/semmle/javascript/Base64.qll

@@ -6,14 +6,12 @@ import javascript
 
 module Base64 {
   /** A call to a base64 encoder. */
-  class Encode extends DataFlow::Node {
-    Encode() { this instanceof Encode::Range }
-
+  class Encode extends DataFlow::Node instanceof Encode::Range {
     /** Gets the input passed to the encoder. */
-    DataFlow::Node getInput() { result = this.(Encode::Range).getInput() }
+    DataFlow::Node getInput() { result = super.getInput() }
 
     /** Gets the base64-encoded output of the encoder. */
-    DataFlow::Node getOutput() { result = this.(Encode::Range).getOutput() }
+    DataFlow::Node getOutput() { result = super.getOutput() }
   }
 
   module Encode {
@@ -32,14 +30,12 @@ module Base64 {
   }
 
   /** A call to a base64 decoder. */
-  class Decode extends DataFlow::Node {
-    Decode() { this instanceof Decode::Range }
-
+  class Decode extends DataFlow::Node instanceof Decode::Range {
     /** Gets the base64-encoded input passed to the decoder. */
-    DataFlow::Node getInput() { result = this.(Decode::Range).getInput() }
+    DataFlow::Node getInput() { result = super.getInput() }
 
     /** Gets the output of the decoder. */
-    DataFlow::Node getOutput() { result = this.(Decode::Range).getOutput() }
+    DataFlow::Node getOutput() { result = super.getOutput() }
   }
 
   module Decode {

javascript/ql/lib/semmle/javascript/Closure.qll

@@ -8,15 +8,11 @@ module Closure {
   /**
    * A reference to a Closure namespace.
    */
-  class ClosureNamespaceRef extends DataFlow::Node {
-    ClosureNamespaceRef() { this instanceof ClosureNamespaceRef::Range }
-
+  class ClosureNamespaceRef extends DataFlow::Node instanceof ClosureNamespaceRef::Range {
     /**
      * Gets the namespace being referenced.
      */
-    string getClosureNamespace() {
-      result = this.(ClosureNamespaceRef::Range).getClosureNamespace()
-    }
+    string getClosureNamespace() { result = super.getClosureNamespace() }
   }
 
   module ClosureNamespaceRef {
@@ -36,8 +32,7 @@ module Closure {
   /**
    * A data flow node that returns the value of a closure namespace.
    */
-  class ClosureNamespaceAccess extends ClosureNamespaceRef {
-    ClosureNamespaceAccess() { this instanceof ClosureNamespaceAccess::Range }
+  class ClosureNamespaceAccess extends ClosureNamespaceRef instanceof ClosureNamespaceAccess::Range {
   }
 
   module ClosureNamespaceAccess {

javascript/ql/lib/semmle/javascript/InclusionTests.qll

@@ -16,22 +16,20 @@ private import javascript
  * ~A.indexOf(B)
  * ```
  */
-class InclusionTest extends DataFlow::Node {
-  InclusionTest() { this instanceof InclusionTest::Range }
-
+class InclusionTest extends DataFlow::Node instanceof InclusionTest::Range {
   /** Gets the `A` in `A.includes(B)`. */
-  DataFlow::Node getContainerNode() { result = this.(InclusionTest::Range).getContainerNode() }
+  DataFlow::Node getContainerNode() { result = super.getContainerNode() }
 
   /** Gets the `B` in `A.includes(B)`. */
-  DataFlow::Node getContainedNode() { result = this.(InclusionTest::Range).getContainedNode() }
+  DataFlow::Node getContainedNode() { result = super.getContainedNode() }
 
   /**
    * Gets the polarity of the check.
    *
    * If the polarity is `false` the check returns `true` if the container does not contain
    * the given element.
    */
-  boolean getPolarity() { result = this.(InclusionTest::Range).getPolarity() }
+  boolean getPolarity() { result = super.getPolarity() }
 }
 
 module InclusionTest {

javascript/ql/lib/semmle/javascript/MembershipCandidates.qll

@@ -9,33 +9,31 @@ import javascript
  *
  * Additional candidates can be added by subclassing `MembershipCandidate::Range`
  */
-class MembershipCandidate extends DataFlow::Node {
-  MembershipCandidate() { this instanceof MembershipCandidate::Range }
-
+class MembershipCandidate extends DataFlow::Node instanceof MembershipCandidate::Range {
   /**
    * Gets the expression that performs the membership test, if any.
    */
-  DataFlow::Node getTest() { result = this.(MembershipCandidate::Range).getTest() }
+  DataFlow::Node getTest() { result = super.getTest() }
 
   /**
    * Gets a string that this candidate is tested against, if
    * it can be determined.
    */
-  string getAMemberString() { result = this.(MembershipCandidate::Range).getAMemberString() }
+  string getAMemberString() { result = super.getAMemberString() }
 
   /**
    * Gets a node that this candidate is tested against, if
    * it can be determined.
    */
-  DataFlow::Node getAMemberNode() { result = this.(MembershipCandidate::Range).getAMemberNode() }
+  DataFlow::Node getAMemberNode() { result = super.getAMemberNode() }
 
   /**
    * Gets the polarity of the test.
    *
    * If the polarity is `false` the test returns `true` if the
    * collection does not contain this candidate.
    */
-  boolean getTestPolarity() { result = this.(MembershipCandidate::Range).getTestPolarity() }
+  boolean getTestPolarity() { result = super.getTestPolarity() }
 }
 
 /**

javascript/ql/lib/semmle/javascript/StringOps.qll

@@ -8,26 +8,24 @@ module StringOps {
   /**
    * A expression that is equivalent to `A.startsWith(B)` or `!A.startsWith(B)`.
    */
-  class StartsWith extends DataFlow::Node {
-    StartsWith() { this instanceof StartsWith::Range }
-
+  class StartsWith extends DataFlow::Node instanceof StartsWith::Range {
     /**
      * Gets the `A` in `A.startsWith(B)`.
      */
-    DataFlow::Node getBaseString() { result = this.(StartsWith::Range).getBaseString() }
+    DataFlow::Node getBaseString() { result = super.getBaseString() }
 
     /**
      * Gets the `B` in `A.startsWith(B)`.
      */
-    DataFlow::Node getSubstring() { result = this.(StartsWith::Range).getSubstring() }
+    DataFlow::Node getSubstring() { result = super.getSubstring() }
 
     /**
      * Gets the polarity of the check.
      *
      * If the polarity is `false` the check returns `true` if the string does not start
      * with the given substring.
      */
-    boolean getPolarity() { result = this.(StartsWith::Range).getPolarity() }
+    boolean getPolarity() { result = super.getPolarity() }
   }
 
   module StartsWith {
@@ -235,26 +233,24 @@ module StringOps {
   /**
    * An expression that is equivalent to `A.endsWith(B)` or `!A.endsWith(B)`.
    */
-  class EndsWith extends DataFlow::Node {
-    EndsWith() { this instanceof EndsWith::Range }
-
+  class EndsWith extends DataFlow::Node instanceof EndsWith::Range {
     /**
      * Gets the `A` in `A.startsWith(B)`.
      */
-    DataFlow::Node getBaseString() { result = this.(EndsWith::Range).getBaseString() }
+    DataFlow::Node getBaseString() { result = super.getBaseString() }
 
     /**
      * Gets the `B` in `A.startsWith(B)`.
      */
-    DataFlow::Node getSubstring() { result = this.(EndsWith::Range).getSubstring() }
+    DataFlow::Node getSubstring() { result = super.getSubstring() }
 
     /**
      * Gets the polarity if the check.
      *
      * If the polarity is `false` the check returns `true` if the string does not end
      * with the given substring.
      */
-    boolean getPolarity() { result = this.(EndsWith::Range).getPolarity() }
+    boolean getPolarity() { result = super.getPolarity() }
   }
 
   module EndsWith {
@@ -658,37 +654,35 @@ module StringOps {
    * if (!match) { ... } // <--- 'match' is the RegExpTest
    * ```
    */
-  class RegExpTest extends DataFlow::Node {
-    RegExpTest() { this instanceof RegExpTest::Range }
-
+  class RegExpTest extends DataFlow::Node instanceof RegExpTest::Range {
     /**
      * Gets the AST of the regular expression used in the test, if it can be seen locally.
      */
     RegExpTerm getRegExp() {
       result = getRegExpOperand().getALocalSource().(DataFlow::RegExpCreationNode).getRoot()
       or
-      result = this.(RegExpTest::Range).getRegExpOperand(true).asExpr().(StringLiteral).asRegExp()
+      result = super.getRegExpOperand(true).asExpr().(StringLiteral).asRegExp()
     }
 
     /**
      * Gets the data flow node corresponding to the regular expression object used in the test.
      *
      * In some cases this represents a string value being coerced to a RegExp object.
      */
-    DataFlow::Node getRegExpOperand() { result = this.(RegExpTest::Range).getRegExpOperand(_) }
+    DataFlow::Node getRegExpOperand() { result = super.getRegExpOperand(_) }
 
     /**
      * Gets the data flow node corresponding to the string being tested against the regular expression.
      */
-    DataFlow::Node getStringOperand() { result = this.(RegExpTest::Range).getStringOperand() }
+    DataFlow::Node getStringOperand() { result = super.getStringOperand() }
 
     /**
      * Gets the return value indicating that the string matched the regular expression.
      *
      * For example, for `regexp.exec(str) == null`, the polarity is `false`, and for
      * `regexp.exec(str) != null` the polarity is `true`.
      */
-    boolean getPolarity() { result = this.(RegExpTest::Range).getPolarity() }
+    boolean getPolarity() { result = super.getPolarity() }
   }
 
   /**