move TLabel to the Impl module and cache it

erik-krogh · erik-krogh · commit 5a39708cf734 · 2022-02-11T10:54:45.000+01:00
diff --git a/ruby/ql/lib/codeql/ruby/ApiGraphs.qll b/ruby/ql/lib/codeql/ruby/ApiGraphs.qll
@@ -600,36 +600,40 @@ module API {
     /** Gets the shortest distance from the root to `nd` in the API graph. */
     cached
     int distanceFromRoot(TApiNode nd) = shortestDistances(MkRoot/0, edge/2)(_, nd, result)
+
+    /** All the possible labels in the API graph. */
+    cached
+    newtype TLabel =
+      MkLabelMember(string member) { member = any(ConstantReadAccess a).getName() } or
+      MkLabelUnknownMember() or
+      MkLabelMethod(string m) { m = any(DataFlow::CallNode c).getMethodName() } or
+      MkLabelReturn() or
+      MkLabelSubclass() or
+      MkLabelKeywordParameter(string name) {
+        any(DataFlowDispatch::ArgumentPosition arg).isKeyword(name)
+        or
+        any(DataFlowDispatch::ParameterPosition arg).isKeyword(name)
+      } or
+      MkLabelParameter(int n) {
+        any(DataFlowDispatch::ArgumentPosition c).isPositional(n)
+        or
+        any(DataFlowDispatch::ParameterPosition c).isPositional(n)
+      } or
+      MkLabelBlockParameter()
   }
 
   /** Provides classes modeling the various edges (labels) in the API graph. */
   module Label {
     /** A label in the API-graph */
-    class ApiLabel extends TLabel {
+    class ApiLabel extends Impl::TLabel {
       /** Gets a string representation of this label. */
       string toString() { result = "???" }
     }
 
     private import LabelImpl
 
     private module LabelImpl {
-      newtype TLabel =
-        MkLabelMember(string member) { member = any(ConstantReadAccess a).getName() } or
-        MkLabelUnknownMember() or
-        MkLabelMethod(string m) { m = any(DataFlow::CallNode c).getMethodName() } or
-        MkLabelReturn() or
-        MkLabelSubclass() or
-        MkLabelKeywordParameter(string name) {
-          any(DataFlowDispatch::ArgumentPosition arg).isKeyword(name)
-          or
-          any(DataFlowDispatch::ParameterPosition arg).isKeyword(name)
-        } or
-        MkLabelParameter(int n) {
-          any(DataFlowDispatch::ArgumentPosition c).isPositional(n)
-          or
-          any(DataFlowDispatch::ParameterPosition c).isPositional(n)
-        } or
-        MkLabelBlockParameter()
+      private import Impl
 
       /** A label for a member, for example a constant. */
       class LabelMember extends ApiLabel {
