Update library

Author: aibaars

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

@@ -252,10 +252,24 @@ class Lambda extends Callable, BodyStmt, TLambda {
 
 /** A block. */
 class Block extends Callable, StmtSequence, Scope, TBlock {
+  /**
+   * Get a local variable declared by this block.
+   * For example `local` in `{ | param; local| puts param }`.
+   */
+  LocalVariableWriteAccess getALocalVariable() { result = this.getLocalVariable(_) }
+
+  /**
+   * Gets the `n`th local variable declared by this block.
+   * For example `local` in `{ | param; local| puts param }`.
+   */
+  LocalVariableWriteAccess getLocalVariable(int n) { none() }
+
   override AstNode getAChild(string pred) {
     result = Callable.super.getAChild(pred)
     or
     result = StmtSequence.super.getAChild(pred)
+    or
+    pred = "getLocalVariable" and result = this.getLocalVariable(_)
   }
 }
 
@@ -265,6 +279,10 @@ class DoBlock extends Block, BodyStmt, TDoBlock {
 
   DoBlock() { this = TDoBlock(g) }
 
+  final override LocalVariableWriteAccess getLocalVariable(int n) {
+    toGenerated(result) = g.getParameters().getLocals(n)
+  }
+
   final override Parameter getParameter(int n) {
     toGenerated(result) = g.getParameters().getChild(n)
   }

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

@@ -138,7 +138,9 @@ private module Cached {
     TFalseLiteral(Ruby::False g) or
     TFile(Ruby::File g) or
     TFindPattern(Ruby::FindPattern g) or
-    TFloatLiteral(Ruby::Float g) { not any(Ruby::Rational r).getChild() = g } or
+    TFloatLiteral(Ruby::Float g) {
+      not any(Ruby::Complex r).getChild() = g and not any(Ruby::Rational r).getChild() = g
+    } or
     TForExpr(Ruby::For g) or
     TForwardParameter(Ruby::ForwardParameter g) or
     TForwardArgument(Ruby::ForwardArgument g) or
@@ -169,7 +171,9 @@ private module Cached {
     TInstanceVariableAccessSynth(AST::AstNode parent, int i, AST::InstanceVariable v) {
       mkSynthChild(InstanceVariableAccessKind(v), parent, i)
     } or
-    TIntegerLiteralReal(Ruby::Integer g) { not any(Ruby::Rational r).getChild() = g } or
+    TIntegerLiteralReal(Ruby::Integer g) {
+      not any(Ruby::Complex r).getChild() = g and not any(Ruby::Rational r).getChild() = g
+    } or
     TIntegerLiteralSynth(AST::AstNode parent, int i, int value) {
       mkSynthChild(IntegerLiteralKind(value), parent, i)
     } or
@@ -223,7 +227,7 @@ private module Cached {
     TRangeLiteralSynth(AST::AstNode parent, int i, boolean inclusive) {
       mkSynthChild(RangeLiteralKind(inclusive), parent, i)
     } or
-    TRationalLiteral(Ruby::Rational g) or
+    TRationalLiteral(Ruby::Rational g) { not any(Ruby::Complex r).getChild() = g } or
     TRedoStmt(Ruby::Redo g) or
     TRegExpLiteral(Ruby::Regex g) or
     TRegExpMatchExpr(Ruby::Binary g) { g instanceof @ruby_binary_equaltilde } or
@@ -248,9 +252,6 @@ private module Cached {
         casePattern(g)
       )
     } or
-    TScopeResolutionMethodCall(Ruby::ScopeResolution g, Ruby::Identifier i) {
-      isScopeResolutionMethodCall(g, i)
-    } or
     TSelfReal(Ruby::Self g) or
     TSelfSynth(AST::AstNode parent, int i, AST::SelfVariable v) {
       mkSynthChild(SelfKind(v), parent, i)
@@ -356,15 +357,15 @@ private module Cached {
         TRShiftExprReal or TRangeLiteralReal or TRationalLiteral or TRedoStmt or TRegExpLiteral or
         TRegExpMatchExpr or TRegularArrayLiteral or TRegularMethodCall or TRegularStringLiteral or
         TRegularSuperCall or TRescueClause or TRescueModifierExpr or TRetryStmt or TReturnStmt or
-        TScopeResolutionConstantAccess or TScopeResolutionMethodCall or TSelfReal or
-        TSimpleParameterReal or TSimpleSymbolLiteral or TSingletonClass or TSingletonMethod or
-        TSpaceshipExpr or TSplatExprReal or TSplatParameter or TStringArrayLiteral or
-        TStringConcatenation or TStringEscapeSequenceComponent or TStringInterpolationComponent or
-        TStringTextComponent or TSubExprReal or TSubshellLiteral or TSymbolArrayLiteral or
-        TTernaryIfExpr or TThen or TTokenConstantAccess or TTokenMethodName or TTokenSuperCall or
-        TToplevel or TTrueLiteral or TUnaryMinusExpr or TUnaryPlusExpr or TUndefStmt or
-        TUnlessExpr or TUnlessModifierExpr or TUntilExpr or TUntilModifierExpr or
-        TReferencePattern or TWhenClause or TWhileExpr or TWhileModifierExpr or TYieldCall;
+        TScopeResolutionConstantAccess or TSelfReal or TSimpleParameterReal or
+        TSimpleSymbolLiteral or TSingletonClass or TSingletonMethod or TSpaceshipExpr or
+        TSplatExprReal or TSplatParameter or TStringArrayLiteral or TStringConcatenation or
+        TStringEscapeSequenceComponent or TStringInterpolationComponent or TStringTextComponent or
+        TSubExprReal or TSubshellLiteral or TSymbolArrayLiteral or TTernaryIfExpr or TThen or
+        TTokenConstantAccess or TTokenMethodName or TTokenSuperCall or TToplevel or TTrueLiteral or
+        TUnaryMinusExpr or TUnaryPlusExpr or TUndefStmt or TUnlessExpr or TUnlessModifierExpr or
+        TUntilExpr or TUntilModifierExpr or TReferencePattern or TWhenClause or TWhileExpr or
+        TWhileModifierExpr or TYieldCall;
 
   class TAstNodeSynth =
     TAddExprSynth or TAssignExprSynth or TBitwiseAndExprSynth or TBitwiseOrExprSynth or
@@ -498,7 +499,6 @@ private module Cached {
     n = TReturnStmt(result) or
     n = TRShiftExprReal(result) or
     n = TScopeResolutionConstantAccess(result, _) or
-    n = TScopeResolutionMethodCall(result, _) or
     n = TSelfReal(result) or
     n = TSimpleParameterReal(result) or
     n = TSimpleSymbolLiteral(result) or
@@ -659,8 +659,8 @@ class TCall = TMethodCall or TYieldCall;
 class TCase = TCaseExpr or TCaseMatch;
 
 class TMethodCall =
-  TMethodCallSynth or TIdentifierMethodCall or TScopeResolutionMethodCall or TRegularMethodCall or
-      TElementReference or TSuperCall or TUnaryOperation or TBinaryOperation;
+  TMethodCallSynth or TIdentifierMethodCall or TRegularMethodCall or TElementReference or
+      TSuperCall or TUnaryOperation or TBinaryOperation;
 
 class TSuperCall = TTokenSuperCall or TRegularSuperCall;
 

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

@@ -7,11 +7,6 @@ predicate isIdentifierMethodCall(Ruby::Identifier g) { vcall(g) and not access(g
 
 predicate isRegularMethodCall(Ruby::Call g) { not g.getMethod() instanceof Ruby::Super }
 
-predicate isScopeResolutionMethodCall(Ruby::ScopeResolution g, Ruby::Identifier i) {
-  i = g.getName() and
-  not exists(Ruby::Call c | c.getMethod() = g)
-}
-
 abstract class CallImpl extends Expr, TCall {
   abstract AstNode getArgumentImpl(int n);
 
@@ -69,23 +64,6 @@ class IdentifierMethodCall extends MethodCallImpl, TIdentifierMethodCall {
   final override Block getBlockImpl() { none() }
 }
 
-class ScopeResolutionMethodCall extends MethodCallImpl, TScopeResolutionMethodCall {
-  private Ruby::ScopeResolution g;
-  private Ruby::Identifier i;
-
-  ScopeResolutionMethodCall() { this = TScopeResolutionMethodCall(g, i) }
-
-  final override string getMethodNameImpl() { result = i.getValue() }
-
-  final override Expr getReceiverImpl() { toGenerated(result) = g.getScope() }
-
-  final override Expr getArgumentImpl(int n) { none() }
-
-  final override int getNumberOfArgumentsImpl() { result = 0 }
-
-  final override Block getBlockImpl() { none() }
-}
-
 class RegularMethodCall extends MethodCallImpl, TRegularMethodCall {
   private Ruby::Call g;
 
@@ -94,33 +72,21 @@ class RegularMethodCall extends MethodCallImpl, TRegularMethodCall {
   final override Expr getReceiverImpl() {
     toGenerated(result) = g.getReceiver()
     or
-    not exists(g.getReceiver()) and
-    toGenerated(result) = g.getMethod().(Ruby::ScopeResolution).getScope()
-    or
     result = TSelfSynth(this, 0, _)
   }
 
   final override string getMethodNameImpl() {
     isRegularMethodCall(g) and
     (
-      result = "call" and g.getMethod() instanceof Ruby::ArgumentList
+      result = "call" and not exists(g.getMethod())
       or
       result = g.getMethod().(Ruby::Token).getValue()
-      or
-      result = g.getMethod().(Ruby::ScopeResolution).getName().(Ruby::Token).getValue()
     )
   }
 
-  final override Expr getArgumentImpl(int n) {
-    toGenerated(result) = g.getArguments().getChild(n)
-    or
-    toGenerated(result) = g.getMethod().(Ruby::ArgumentList).getChild(n)
-  }
+  final override Expr getArgumentImpl(int n) { toGenerated(result) = g.getArguments().getChild(n) }
 
-  final override int getNumberOfArgumentsImpl() {
-    result =
-      count(g.getArguments().getChild(_)) + count(g.getMethod().(Ruby::ArgumentList).getChild(_))
-  }
+  final override int getNumberOfArgumentsImpl() { result = count(g.getArguments().getChild(_)) }
 
   final override Block getBlockImpl() { toGenerated(result) = g.getBlock() }
 }

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

@@ -88,9 +88,11 @@ class RationalLiteralImpl extends Expr, TRationalLiteral {
 }
 
 float getComplexValue(Ruby::Complex c) {
+  exists(int n, int d | isRationalValue(c.getChild(), n, d) and result = n.(float) / d.(float))
+  or
   exists(string s |
-    s = c.getValue() and
-    result = s.prefix(s.length() - 1).toFloat()
+    s = c.getChild().(Ruby::Token).getValue() and
+    result = s.prefix(s.length()).toFloat()
   )
 }
 
@@ -103,7 +105,10 @@ class ComplexLiteralImpl extends Expr, TComplexLiteral {
     real = 0 and imaginary = getComplexValue(g)
   }
 
-  final override string toString() { result = g.getValue() }
+  final override string toString() {
+    result = g.getChild().(Ruby::Token).getValue() + "i" or
+    result = g.getChild().(Ruby::Rational).getChild().(Ruby::Token).getValue() + "ri"
+  }
 }
 
 class NilLiteralImpl extends Expr, TNilLiteral {

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

@@ -7,6 +7,10 @@ class BraceBlockReal extends BraceBlock, TBraceBlockReal {
 
   BraceBlockReal() { this = TBraceBlockReal(g) }
 
+  final override LocalVariableWriteAccess getLocalVariable(int n) {
+    toGenerated(result) = g.getParameters().getLocals(n)
+  }
+
   final override Parameter getParameter(int n) {
     toGenerated(result) = g.getParameters().getChild(n)
   }

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

@@ -197,11 +197,8 @@ private module ImplicitSelfSynthesis {
   private predicate regularMethodCallSelfSynthesis(TRegularMethodCall mc, int i, Child child) {
     exists(Ruby::AstNode g |
       mc = TRegularMethodCall(g) and
-      // If there's no explicit receiver (or scope resolution that acts like a
-      // receiver), then the receiver is implicitly `self`.  N.B.  `::Foo()` is
-      // not valid Ruby.
-      not exists(g.(Ruby::Call).getReceiver()) and
-      not exists(g.(Ruby::Call).getMethod().(Ruby::ScopeResolution).getScope())
+      // If there's no explicit receiver, then the receiver is implicitly `self`.
+      not exists(g.(Ruby::Call).getReceiver())
     ) and
     child = SynthChild(SelfKind(TSelfVariable(scopeOf(toGenerated(mc)).getEnclosingSelfScope()))) and
     i = 0

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

@@ -50,8 +50,9 @@ predicate implicitAssignmentNode(Ruby::AstNode n) {
 
 /** Holds if `n` is inside a parameter. */
 predicate implicitParameterAssignmentNode(Ruby::AstNode n, Callable::Range c) {
-  n = c.getParameter(_)
-  or
+  n = c.getParameter(_) or
+  n = c.(Ruby::Block).getParameters().getLocals(_) or
+  n = c.(Ruby::DoBlock).getParameters().getLocals(_) or
   implicitParameterAssignmentNode(n.getParent().(Ruby::DestructuredParameter), c)
 }
 

ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll

@@ -347,7 +347,12 @@ module Trees {
     final override AstNode getBodyChild(int i, boolean rescuable) {
       result = this.getParameter(i) and rescuable = false
       or
-      result = StmtSequenceTree.super.getBodyChild(i - this.getNumberOfParameters(), rescuable)
+      result = this.getLocalVariable(i - this.getNumberOfParameters()) and rescuable = false
+      or
+      result =
+        StmtSequenceTree.super
+            .getBodyChild(i - this.getNumberOfParameters() - count(this.getALocalVariable()),
+              rescuable)
     }
 
     override predicate first(AstNode first) { first = this }
@@ -959,7 +964,12 @@ module Trees {
     final override AstNode getBodyChild(int i, boolean rescuable) {
       result = this.getParameter(i) and rescuable = false
       or
-      result = BodyStmtTree.super.getBodyChild(i - this.getNumberOfParameters(), rescuable)
+      result = this.getLocalVariable(i - this.getNumberOfParameters()) and rescuable = false
+      or
+      result =
+        BodyStmtTree.super
+            .getBodyChild(i - this.getNumberOfParameters() - count(this.getALocalVariable()),
+              rescuable)
     }
 
     override predicate propagatesAbnormal(AstNode child) { none() }