Address comments

Author: aibaars

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

@@ -235,55 +235,6 @@ class ConstantAccess extends Expr, TConstantAccess {
   }
 }
 
-private class TokenConstantAccess extends ConstantAccess, TTokenConstantAccess {
-  private Ruby::Constant g;
-
-  TokenConstantAccess() { this = TTokenConstantAccess(g) }
-
-  final override string getName() { result = g.getValue() }
-}
-
-private class ScopeResolutionConstantAccess extends ConstantAccess, TScopeResolutionConstantAccess {
-  private Ruby::ScopeResolution g;
-  private Ruby::Constant constant;
-
-  ScopeResolutionConstantAccess() { this = TScopeResolutionConstantAccess(g, constant) }
-
-  final override string getName() { result = constant.getValue() }
-
-  final override Expr getScopeExpr() { toGenerated(result) = g.getScope() }
-
-  final override predicate hasGlobalScope() { not exists(g.getScope()) }
-}
-
-private class ConstantReadAccessSynth extends ConstantAccess, TConstantReadAccessSynth {
-  private string value;
-
-  ConstantReadAccessSynth() { this = TConstantReadAccessSynth(_, _, value) }
-
-  final override string getName() {
-    if this.hasGlobalScope() then result = value.suffix(2) else result = value
-  }
-
-  final override Expr getScopeExpr() { synthChild(this, 0, result) }
-
-  final override predicate hasGlobalScope() { value.matches("::%") }
-}
-
-private class ConstantWriteAccessSynth extends ConstantAccess, TConstantWriteAccessSynth {
-  private string value;
-
-  ConstantWriteAccessSynth() { this = TConstantWriteAccessSynth(_, _, value) }
-
-  final override string getName() {
-    if this.hasGlobalScope() then result = value.suffix(2) else result = value
-  }
-
-  final override Expr getScopeExpr() { synthChild(this, 0, result) }
-
-  final override predicate hasGlobalScope() { value.matches("::%") }
-}
-
 /**
  * A use (read) of a constant.
  *

ruby/ql/lib/codeql/ruby/ast/internal/Constant.qll

@@ -1,6 +1,8 @@
 private import codeql.ruby.AST
+private import codeql.ruby.ast.internal.AST
 private import codeql.ruby.ast.internal.Literal
 private import codeql.ruby.ast.internal.Module
+private import codeql.ruby.ast.internal.TreeSitter
 private import codeql.ruby.controlflow.CfgNodes
 private import codeql.ruby.dataflow.SSA
 private import ExprNodes
@@ -559,3 +561,60 @@ private predicate isArrayExpr(Expr e, ArrayLiteralCfgNode arr) {
   // results if the source is a phi node.
   forex(ExprCfgNode n | n = e.getAControlFlowNode() | isArrayConstant(n, arr))
 }
+
+private class TokenConstantAccess extends ConstantAccess, TTokenConstantAccess {
+  private Ruby::Constant g;
+
+  TokenConstantAccess() { this = TTokenConstantAccess(g) }
+
+  final override string getName() { result = g.getValue() }
+}
+
+/**
+ * A constant access that has a scope resolution qualifier.
+ */
+class ScopeResolutionConstantAccess extends ConstantAccess, TScopeResolutionConstantAccess {
+  private Ruby::ScopeResolution g;
+  private Ruby::Constant constant;
+
+  ScopeResolutionConstantAccess() { this = TScopeResolutionConstantAccess(g, constant) }
+
+  /**
+   * Gets the name of the constant.
+   */
+  final override string getName() { result = constant.getValue() }
+
+  /** Gets the scope resolution expression. */
+  final override Expr getScopeExpr() { toGenerated(result) = g.getScope() }
+
+  /** Holds if this constant access has a global scope. */
+  final override predicate hasGlobalScope() { not exists(g.getScope()) }
+}
+
+private class ConstantReadAccessSynth extends ConstantAccess, TConstantReadAccessSynth {
+  private string value;
+
+  ConstantReadAccessSynth() { this = TConstantReadAccessSynth(_, _, value) }
+
+  final override string getName() {
+    if this.hasGlobalScope() then result = value.suffix(2) else result = value
+  }
+
+  final override Expr getScopeExpr() { synthChild(this, 0, result) }
+
+  final override predicate hasGlobalScope() { value.matches("::%") }
+}
+
+private class ConstantWriteAccessSynth extends ConstantAccess, TConstantWriteAccessSynth {
+  private string value;
+
+  ConstantWriteAccessSynth() { this = TConstantWriteAccessSynth(_, _, value) }
+
+  final override string getName() {
+    if this.hasGlobalScope() then result = value.suffix(2) else result = value
+  }
+
+  final override Expr getScopeExpr() { synthChild(this, 0, result) }
+
+  final override predicate hasGlobalScope() { value.matches("::%") }
+}

ruby/ql/lib/codeql/ruby/ast/internal/Synthesis.qll

@@ -3,6 +3,7 @@
 private import AST
 private import TreeSitter
 private import codeql.ruby.ast.internal.Call
+private import codeql.ruby.ast.internal.Constant
 private import codeql.ruby.ast.internal.Expr
 private import codeql.ruby.ast.internal.Variable
 private import codeql.ruby.ast.internal.Pattern
@@ -964,24 +965,12 @@ private module DestructuredAssignDesugar {
     }
   }
 
-  private class LhsScopedConstant extends LhsWithReceiver, TScopeResolutionConstantAccess {
-    private Ruby::AstNode receiver;
-    private string name;
+  private class LhsScopedConstant extends LhsWithReceiver, ScopeResolutionConstantAccess {
+    LhsScopedConstant() { exists(this.getScopeExpr()) }
 
-    LhsScopedConstant() {
-      exists(Ruby::ScopeResolution e, Ruby::Constant c |
-        this = TScopeResolutionConstantAccess(e, c)
-      |
-        receiver = e.getScope() and
-        name = c.getValue()
-      )
-    }
-
-    final string getName() { result = name }
-
-    final override Expr getReceiver() { toGenerated(result) = receiver }
+    final override Expr getReceiver() { result = this.getScopeExpr() }
 
-    final override SynthKind getSynthKind() { result = ConstantWriteAccessKind(name) }
+    final override SynthKind getSynthKind() { result = ConstantWriteAccessKind(this.getName()) }
   }
 
   pragma[nomagic]