Merge pull request github#357 from github/erik-krogh/fix-implicit-this

Add explicit `this` qualifiers

Author: hvitved

ql/lib/codeql/Locations.qll

@@ -25,12 +25,12 @@ class Location extends @location {
   int getEndColumn() { locations_default(this, _, _, _, _, result) }
 
   /** Gets the number of lines covered by this location. */
-  int getNumLines() { result = getEndLine() - getStartLine() + 1 }
+  int getNumLines() { result = this.getEndLine() - this.getStartLine() + 1 }
 
   /** Gets a textual representation of this element. */
   string toString() {
     exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
-      hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
+      this.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
       result = filepath + "@" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
     )
   }

ql/lib/codeql/files/FileSystem.qll

@@ -8,10 +8,10 @@ abstract class Container extends @container {
   Container getAChildContainer() { this = result.getParentContainer() }
 
   /** Gets a file in this container. */
-  File getAFile() { result = getAChildContainer() }
+  File getAFile() { result = this.getAChildContainer() }
 
   /** Gets a sub-folder in this container. */
-  Folder getAFolder() { result = getAChildContainer() }
+  Folder getAFolder() { result = this.getAChildContainer() }
 
   /**
    * Gets the absolute, canonical path of this container, using forward slashes
@@ -57,7 +57,7 @@ abstract class Container extends @container {
    * </table>
    */
   string getBaseName() {
-    result = getAbsolutePath().regexpCapture(".*/(([^/]*?)(?:\\.([^.]*))?)", 1)
+    result = this.getAbsolutePath().regexpCapture(".*/(([^/]*?)(?:\\.([^.]*))?)", 1)
   }
 
   /**
@@ -83,17 +83,19 @@ abstract class Container extends @container {
    * <tr><td>"/tmp/x.tar.gz"</td><td>"gz"</td></tr>
    * </table>
    */
-  string getExtension() { result = getAbsolutePath().regexpCapture(".*/([^/]*?)(\\.([^.]*))?", 3) }
+  string getExtension() {
+    result = this.getAbsolutePath().regexpCapture(".*/([^/]*?)(\\.([^.]*))?", 3)
+  }
 
   /** Gets the file in this container that has the given `baseName`, if any. */
   File getFile(string baseName) {
-    result = getAFile() and
+    result = this.getAFile() and
     result.getBaseName() = baseName
   }
 
   /** Gets the sub-folder in this container that has the given `baseName`, if any. */
   Folder getFolder(string baseName) {
-    result = getAFolder() and
+    result = this.getAFolder() and
     result.getBaseName() = baseName
   }
 
@@ -110,7 +112,7 @@ abstract class Container extends @container {
    */
   string getRelativePath() {
     exists(string absPath, string pref |
-      absPath = getAbsolutePath() and sourceLocationPrefix(pref)
+      absPath = this.getAbsolutePath() and sourceLocationPrefix(pref)
     |
       absPath = pref and result = ""
       or
@@ -136,7 +138,9 @@ abstract class Container extends @container {
    * <tr><td>"/tmp/x.tar.gz"</td><td>"x.tar"</td></tr>
    * </table>
    */
-  string getStem() { result = getAbsolutePath().regexpCapture(".*/([^/]*?)(?:\\.([^.]*))?", 1) }
+  string getStem() {
+    result = this.getAbsolutePath().regexpCapture(".*/([^/]*?)(?:\\.([^.]*))?", 1)
+  }
 
   /**
    * Gets a URL representing the location of this container.
@@ -150,15 +154,15 @@ abstract class Container extends @container {
    *
    * This is the absolute path of the container.
    */
-  string toString() { result = getAbsolutePath() }
+  string toString() { result = this.getAbsolutePath() }
 }
 
 /** A folder. */
 class Folder extends Container, @folder {
   override string getAbsolutePath() { folders(this, result) }
 
   /** Gets the URL of this folder. */
-  override string getURL() { result = "folder://" + getAbsolutePath() }
+  override string getURL() { result = "folder://" + this.getAbsolutePath() }
 }
 
 /** A file. */

ql/lib/codeql/ruby/ApiGraphs.qll

@@ -47,7 +47,7 @@ module API {
      * Gets a call to a method on the receiver represented by this API component.
      */
     DataFlow::CallNode getAMethodCall(string method) {
-      result = getReturn(method).getAnImmediateUse()
+      result = this.getReturn(method).getAnImmediateUse()
     }
 
     /**
@@ -60,21 +60,21 @@ module API {
      */
     bindingset[m]
     bindingset[result]
-    Node getMember(string m) { result = getASuccessor(Label::member(m)) }
+    Node getMember(string m) { result = this.getASuccessor(Label::member(m)) }
 
     /**
      * Gets a node representing a member of this API component where the name of the member is
      * not known statically.
      */
-    Node getUnknownMember() { result = getASuccessor(Label::unknownMember()) }
+    Node getUnknownMember() { result = this.getASuccessor(Label::unknownMember()) }
 
     /**
      * Gets a node representing a member of this API component where the name of the member may
      * or may not be known statically.
      */
     Node getAMember() {
-      result = getASuccessor(Label::member(_)) or
-      result = getUnknownMember()
+      result = this.getASuccessor(Label::member(_)) or
+      result = this.getUnknownMember()
     }
 
     /**
@@ -88,28 +88,30 @@ module API {
      * This predicate may have multiple results when there are multiple constructor calls invoking this API component.
      * Consider using `getAnInstantiation()` if there is a need to distinguish between individual constructor calls.
      */
-    Node getInstance() { result = getASuccessor(Label::instance()) }
+    Node getInstance() { result = this.getASuccessor(Label::instance()) }
 
     /**
      * Gets a node representing the result of calling a method on the receiver represented by this node.
      */
-    Node getReturn(string method) { result = getASuccessor(Label::return(method)) }
+    Node getReturn(string method) { result = this.getASuccessor(Label::return(method)) }
 
     /**
      * Gets a `new` call to the function represented by this API component.
      */
-    DataFlow::Node getAnInstantiation() { result = getInstance().getAnImmediateUse() }
+    DataFlow::Node getAnInstantiation() { result = this.getInstance().getAnImmediateUse() }
 
     /**
      * Gets a node representing a subclass of the class represented by this node.
      */
-    Node getASubclass() { result = getASuccessor(Label::subclass()) }
+    Node getASubclass() { result = this.getASuccessor(Label::subclass()) }
 
     /**
      * Gets a string representation of the lexicographically least among all shortest access paths
      * from the root to this node.
      */
-    string getPath() { result = min(string p | p = getAPath(Impl::distanceFromRoot(this)) | p) }
+    string getPath() {
+      result = min(string p | p = this.getAPath(Impl::distanceFromRoot(this)) | p)
+    }
 
     /**
      * Gets a node such that there is an edge in the API graph between this node and the other
@@ -127,13 +129,13 @@ module API {
      * Gets a node such that there is an edge in the API graph between this node and the other
      * one.
      */
-    Node getAPredecessor() { result = getAPredecessor(_) }
+    Node getAPredecessor() { result = this.getAPredecessor(_) }
 
     /**
      * Gets a node such that there is an edge in the API graph between that other node and
      * this one.
      */
-    Node getASuccessor() { result = getASuccessor(_) }
+    Node getASuccessor() { result = this.getASuccessor(_) }
 
     /**
      * Gets the data-flow node that gives rise to this node, if any.
@@ -146,7 +148,7 @@ module API {
       or
       // For nodes that do not have a meaningful location, `path` is the empty string and all other
       // parameters are zero.
-      not exists(getInducingNode()) and
+      not exists(this.getInducingNode()) and
       result instanceof EmptyLocation
     }
 
@@ -189,7 +191,7 @@ module API {
   class Use extends Node, Impl::MkUse {
     override string toString() {
       exists(string type | type = "Use " |
-        result = type + getPath()
+        result = type + this.getPath()
         or
         not exists(this.getPath()) and result = type + "with no path"
       )

ql/lib/codeql/ruby/ast/Control.qll

@@ -184,9 +184,9 @@ class UnlessExpr extends ConditionalExpr, TUnlessExpr {
   final Stmt getElse() { toGenerated(result) = g.getAlternative() }
 
   final override Expr getBranch(boolean cond) {
-    cond = false and result = getThen()
+    cond = false and result = this.getThen()
     or
-    cond = true and result = getElse()
+    cond = true and result = this.getElse()
   }
 
   final override string toString() { result = "unless ..." }
@@ -292,9 +292,9 @@ class TernaryIfExpr extends ConditionalExpr, TTernaryIfExpr {
   final Stmt getElse() { toGenerated(result) = g.getAlternative() }
 
   final override Stmt getBranch(boolean cond) {
-    cond = true and result = getThen()
+    cond = true and result = this.getThen()
     or
-    cond = false and result = getElse()
+    cond = false and result = this.getElse()
   }
 
   final override string toString() { result = "... ? ... : ..." }
@@ -349,10 +349,10 @@ class CaseExpr extends ControlExpr, TCaseExpr {
   final Expr getABranch() { result = this.getBranch(_) }
 
   /** Gets a `when` branch of this case expression. */
-  final WhenExpr getAWhenBranch() { result = getABranch() }
+  final WhenExpr getAWhenBranch() { result = this.getABranch() }
 
   /** Gets the `else` branch of this case expression, if any. */
-  final StmtSequence getElseBranch() { result = getABranch() }
+  final StmtSequence getElseBranch() { result = this.getABranch() }
 
   /**
    * Gets the number of branches of this case expression.

ql/lib/codeql/ruby/ast/Expr.qll

@@ -183,7 +183,7 @@ class BodyStmt extends StmtSequence, TBodyStmt {
   /** Gets the `n`th rescue clause in this block. */
   final RescueClause getRescue(int n) {
     result =
-      rank[n + 1](RescueClause node, int i | toGenerated(node) = getChild(i) | node order by i)
+      rank[n + 1](RescueClause node, int i | toGenerated(node) = this.getChild(i) | node order by i)
   }
 
   /** Gets a rescue clause in this block. */

ql/lib/codeql/ruby/ast/Literal.qll

@@ -631,7 +631,7 @@ class HereDoc extends StringlikeLiteral, THereDoc {
    * COMMAND
    * ```
    */
-  final predicate isSubShell() { getQuoteStyle() = "`" }
+  final predicate isSubShell() { this.getQuoteStyle() = "`" }
 
   /**
    * Gets the quotation mark (`"`, `'` or `` ` ``) that surrounds the here document identifier, if any.

ql/lib/codeql/ruby/ast/Module.qll

@@ -125,7 +125,7 @@ class Toplevel extends ModuleBase, TToplevel {
   /**
    * Gets a `BEGIN` block.
    */
-  final BeginBlock getABeginBlock() { result = getBeginBlock(_) }
+  final BeginBlock getABeginBlock() { result = this.getBeginBlock(_) }
 
   final override AstNode getAChild(string pred) {
     result = super.getAChild(pred)

ql/lib/codeql/ruby/ast/Operation.qll

@@ -453,9 +453,9 @@ class Assignment extends Operation instanceof AssignmentImpl {
   override AstNode getAChild(string pred) {
     result = Operation.super.getAChild(pred)
     or
-    pred = "getLeftOperand" and result = getLeftOperand()
+    pred = "getLeftOperand" and result = this.getLeftOperand()
     or
-    pred = "getRightOperand" and result = getRightOperand()
+    pred = "getRightOperand" and result = this.getRightOperand()
   }
 }
 

ql/lib/codeql/ruby/ast/Pattern.qll

@@ -92,5 +92,5 @@ class TuplePattern extends Pattern, TTuplePattern {
 
   override string toString() { result = "(..., ...)" }
 
-  override AstNode getAChild(string pred) { pred = "getElement" and result = getElement(_) }
+  override AstNode getAChild(string pred) { pred = "getElement" and result = this.getElement(_) }
 }

ql/lib/codeql/ruby/ast/Statement.qll

@@ -97,7 +97,7 @@ class UndefStmt extends Stmt, TUndefStmt {
   final MethodName getMethodName(int n) { toGenerated(result) = g.getChild(n) }
 
   /** Gets a method name to undefine. */
-  final MethodName getAMethodName() { result = getMethodName(_) }
+  final MethodName getAMethodName() { result = this.getMethodName(_) }
 
   final override string getAPrimaryQlClass() { result = "UndefStmt" }