Merge pull request #72 from github/aibaars/fix-cfg

CFG improvements

Author: aibaars

.github/workflows/dataset_measure.yml

@@ -22,7 +22,8 @@ jobs:
 
       - name: Fetch CodeQL
         run: |
-          gh release download --repo https://github.com/github/codeql-cli-binaries --pattern codeql-linux64.zip
+          LATEST=$(gh release list --repo https://github.com/github/codeql-cli-binaries | cut -f 1 | sort --version-sort | tail -1)
+          gh release download --repo https://github.com/github/codeql-cli-binaries --pattern codeql-linux64.zip "$LATEST"
           unzip -q codeql-linux64.zip
         env:
           GITHUB_TOKEN: ${{ github.token }}

.github/workflows/qltest.yml

@@ -16,7 +16,8 @@ jobs:
       - uses: actions/checkout@v2
       - name: Fetch CodeQL
         run: | 
-          gh release download --repo https://github.com/github/codeql-cli-binaries --pattern codeql-linux64.zip
+          LATEST=$(gh release list --repo https://github.com/github/codeql-cli-binaries | cut -f 1 | sort --version-sort | tail -1)
+          gh release download --repo https://github.com/github/codeql-cli-binaries --pattern codeql-linux64.zip "$LATEST"
           unzip -q codeql-linux64.zip
         env:
           GITHUB_TOKEN: ${{ github.token }}

ql/src/codeql_ruby/controlflow/ControlFlowGraph.qll

@@ -8,36 +8,14 @@ private import internal.ControlFlowGraphImpl
 private import internal.Splitting
 private import internal.Completion
 
-private class CfgScopeRange =
-  @program or @begin_block or @end_block or @method or @singleton_method or @block or @do_block or
-      @lambda;
-
 /** An AST node with an associated control-flow graph. */
-class CfgScope extends AstNode, CfgScopeRange {
+class CfgScope extends AstNode {
+  CfgScope::Range_ range;
+
+  CfgScope() { range = this }
+
   /** Gets the name of this scope. */
-  string getName() {
-    this instanceof Program and
-    result = "top-level"
-    or
-    this instanceof BeginBlock and
-    result = "BEGIN block"
-    or
-    this instanceof EndBlock and
-    result = "END block"
-    or
-    result = this.(Method).getName().toString()
-    or
-    result = this.(SingletonMethod).getName().toString()
-    or
-    this instanceof Block and
-    result = "block"
-    or
-    this instanceof DoBlock and
-    result = "do block"
-    or
-    this instanceof Lambda and
-    result = "lambda"
-  }
+  string getName() { result = range.getName() }
 }
 
 /**