Merge pull request #338 from github/aibaars/update-grammar

Update tree-sitter-ruby

Author: aibaars

Cargo.lock

@@ -11,7 +11,7 @@ flate2 = "1.0"
 node-types = { path = "../node-types" }
 tree-sitter = "0.19"
 tree-sitter-embedded-template = "0.19"
-tree-sitter-ruby = "0.19"
+tree-sitter-ruby = { git = "https://github.com/tree-sitter/tree-sitter-ruby.git", rev = "bb6a42e42b048627a74a127d3e0184c1eef01de9" }
 clap = "2.33"
 tracing = "0.1"
 tracing-subscriber = { version = "0.2", features = ["env-filter"] }

extractor/Cargo.toml

@@ -12,4 +12,4 @@ node-types = { path = "../node-types" }
 tracing = "0.1"
 tracing-subscriber = { version = "0.2", features = ["env-filter"] }
 tree-sitter-embedded-template = "0.19"
-tree-sitter-ruby = "0.19"
+tree-sitter-ruby = { git = "https://github.com/tree-sitter/tree-sitter-ruby.git", rev = "bb6a42e42b048627a74a127d3e0184c1eef01de9" }

generator/Cargo.toml

@@ -197,3 +197,19 @@ class BlockArgument extends Expr, TBlockArgument {
     pred = "getValue" and result = this.getValue()
   }
 }
+
+/**
+ * A `...` expression that contains forwarded arguments.
+ * ```rb
+ * foo(...)
+ * ```
+ */
+class ForwardedArguments extends Expr, TForwardArgument {
+  private Ruby::ForwardArgument g;
+
+  ForwardedArguments() { this = TForwardArgument(g) }
+
+  final override string getAPrimaryQlClass() { result = "ForwardedArguments" }
+
+  final override string toString() { result = "..." }
+}

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

@@ -233,3 +233,16 @@ class SplatParameter extends NamedParameter, TSplatParameter {
 
   final override string getName() { result = g.getName().getValue() }
 }
+
+/**
+ * A special `...` parameter that forwards positional/keyword/block arguments:
+ * ```rb
+ * def foo(...)
+ * end
+ * ```
+ */
+class ForwardParameter extends Parameter, TForwardParameter {
+  final override string getAPrimaryQlClass() { result = "ForwardParameter" }
+
+  final override string toString() { result = "..." }
+}

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

@@ -132,6 +132,8 @@ private module Cached {
     TFloatLiteral(Ruby::Float g) { not any(Ruby::Rational r).getChild() = g } or
     TForExpr(Ruby::For g) or
     TForIn(Ruby::In g) or // TODO REMOVE
+    TForwardParameter(Ruby::ForwardParameter g) or
+    TForwardArgument(Ruby::ForwardArgument g) or
     TGEExpr(Ruby::Binary g) { g instanceof @ruby_binary_rangleequal } or
     TGTExpr(Ruby::Binary g) { g instanceof @ruby_binary_rangle } or
     TGlobalVariableAccessReal(Ruby::GlobalVariable g, AST::GlobalVariable v) {
@@ -340,6 +342,8 @@ private module Cached {
     n = TFloatLiteral(result) or
     n = TForExpr(result) or
     n = TForIn(result) or // TODO REMOVE
+    n = TForwardArgument(result) or
+    n = TForwardParameter(result) or
     n = TGEExpr(result) or
     n = TGTExpr(result) or
     n = TGlobalVariableAccessReal(result, _) or
@@ -550,7 +554,8 @@ class TSelf = TSelfReal or TSelfSynth;
 class TExpr =
   TSelf or TArgumentList or TRescueClause or TRescueModifierExpr or TPair or TStringConcatenation or
       TCall or TBlockArgument or TConstantAccess or TControlExpr or TWhenExpr or TLiteral or
-      TCallable or TVariableAccess or TStmtSequence or TOperation or TSimpleParameter;
+      TCallable or TVariableAccess or TStmtSequence or TOperation or TSimpleParameter or
+      TForwardArgument;
 
 class TSplatExpr = TSplatExprReal or TSplatExprSynth;
 
@@ -677,7 +682,7 @@ class TReturningStmt = TReturnStmt or TBreakStmt or TNextStmt;
 
 class TParameter =
   TPatternParameter or TBlockParameter or THashSplatParameter or TKeywordParameter or
-      TOptionalParameter or TSplatParameter;
+      TOptionalParameter or TSplatParameter or TForwardParameter;
 
 class TPatternParameter = TSimpleParameter or TTuplePatternParameter;
 

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

@@ -742,6 +742,18 @@ module Ruby {
     }
   }
 
+  /** A class representing `forward_argument` tokens. */
+  class ForwardArgument extends @ruby_token_forward_argument, Token {
+    /** Gets the name of the primary QL class for this element. */
+    override string getAPrimaryQlClass() { result = "ForwardArgument" }
+  }
+
+  /** A class representing `forward_parameter` tokens. */
+  class ForwardParameter extends @ruby_token_forward_parameter, Token {
+    /** Gets the name of the primary QL class for this element. */
+    override string getAPrimaryQlClass() { result = "ForwardParameter" }
+  }
+
   /** A class representing `global_variable` tokens. */
   class GlobalVariable extends @ruby_token_global_variable, Token {
     /** Gets the name of the primary QL class for this element. */

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

@@ -69,7 +69,7 @@ ruby_alias_def(
   int loc: @location ref
 );
 
-@ruby_argument_list_child_type = @ruby_block_argument | @ruby_break | @ruby_call | @ruby_hash_splat_argument | @ruby_next | @ruby_pair | @ruby_return | @ruby_splat_argument | @ruby_underscore_arg | @ruby_yield
+@ruby_argument_list_child_type = @ruby_block_argument | @ruby_break | @ruby_call | @ruby_hash_splat_argument | @ruby_next | @ruby_pair | @ruby_return | @ruby_splat_argument | @ruby_token_forward_argument | @ruby_underscore_arg | @ruby_yield
 
 #keyset[ruby_argument_list, index]
 ruby_argument_list_child(
@@ -83,7 +83,7 @@ ruby_argument_list_def(
   int loc: @location ref
 );
 
-@ruby_array_child_type = @ruby_block_argument | @ruby_break | @ruby_call | @ruby_hash_splat_argument | @ruby_next | @ruby_pair | @ruby_return | @ruby_splat_argument | @ruby_underscore_arg | @ruby_yield
+@ruby_array_child_type = @ruby_block_argument | @ruby_break | @ruby_call | @ruby_hash_splat_argument | @ruby_next | @ruby_pair | @ruby_return | @ruby_splat_argument | @ruby_token_forward_argument | @ruby_underscore_arg | @ruby_yield
 
 #keyset[ruby_array, index]
 ruby_array_child(
@@ -236,7 +236,7 @@ ruby_block_parameter_def(
   int loc: @location ref
 );
 
-@ruby_block_parameters_child_type = @ruby_block_parameter | @ruby_destructured_parameter | @ruby_hash_splat_parameter | @ruby_keyword_parameter | @ruby_optional_parameter | @ruby_splat_parameter | @ruby_token_identifier
+@ruby_block_parameters_child_type = @ruby_block_parameter | @ruby_destructured_parameter | @ruby_hash_splat_parameter | @ruby_keyword_parameter | @ruby_optional_parameter | @ruby_splat_parameter | @ruby_token_forward_parameter | @ruby_token_identifier
 
 #keyset[ruby_block_parameters, index]
 ruby_block_parameters_child(
@@ -376,7 +376,7 @@ ruby_destructured_left_assignment_def(
   int loc: @location ref
 );
 
-@ruby_destructured_parameter_child_type = @ruby_block_parameter | @ruby_destructured_parameter | @ruby_hash_splat_parameter | @ruby_keyword_parameter | @ruby_optional_parameter | @ruby_splat_parameter | @ruby_token_identifier
+@ruby_destructured_parameter_child_type = @ruby_block_parameter | @ruby_destructured_parameter | @ruby_hash_splat_parameter | @ruby_keyword_parameter | @ruby_optional_parameter | @ruby_splat_parameter | @ruby_token_forward_parameter | @ruby_token_identifier
 
 #keyset[ruby_destructured_parameter, index]
 ruby_destructured_parameter_child(
@@ -423,7 +423,7 @@ ruby_do_block_def(
   int loc: @location ref
 );
 
-@ruby_element_reference_child_type = @ruby_block_argument | @ruby_break | @ruby_call | @ruby_hash_splat_argument | @ruby_next | @ruby_pair | @ruby_return | @ruby_splat_argument | @ruby_underscore_arg | @ruby_yield
+@ruby_element_reference_child_type = @ruby_block_argument | @ruby_break | @ruby_call | @ruby_hash_splat_argument | @ruby_next | @ruby_pair | @ruby_return | @ruby_splat_argument | @ruby_token_forward_argument | @ruby_underscore_arg | @ruby_yield
 
 #keyset[ruby_element_reference, index]
 ruby_element_reference_child(
@@ -643,7 +643,7 @@ ruby_lambda_def(
   int loc: @location ref
 );
 
-@ruby_lambda_parameters_child_type = @ruby_block_parameter | @ruby_destructured_parameter | @ruby_hash_splat_parameter | @ruby_keyword_parameter | @ruby_optional_parameter | @ruby_splat_parameter | @ruby_token_identifier
+@ruby_lambda_parameters_child_type = @ruby_block_parameter | @ruby_destructured_parameter | @ruby_hash_splat_parameter | @ruby_keyword_parameter | @ruby_optional_parameter | @ruby_splat_parameter | @ruby_token_forward_parameter | @ruby_token_identifier
 
 #keyset[ruby_lambda_parameters, index]
 ruby_lambda_parameters_child(
@@ -691,7 +691,7 @@ ruby_method_def(
   int loc: @location ref
 );
 
-@ruby_method_parameters_child_type = @ruby_block_parameter | @ruby_destructured_parameter | @ruby_hash_splat_parameter | @ruby_keyword_parameter | @ruby_optional_parameter | @ruby_splat_parameter | @ruby_token_identifier
+@ruby_method_parameters_child_type = @ruby_block_parameter | @ruby_destructured_parameter | @ruby_hash_splat_parameter | @ruby_keyword_parameter | @ruby_optional_parameter | @ruby_splat_parameter | @ruby_token_forward_parameter | @ruby_token_identifier
 
 #keyset[ruby_method_parameters, index]
 ruby_method_parameters_child(
@@ -1220,22 +1220,24 @@ case @ruby_token.kind of
 | 7 = @ruby_token_escape_sequence
 | 8 = @ruby_token_false
 | 9 = @ruby_token_float
-| 10 = @ruby_token_global_variable
-| 11 = @ruby_token_hash_key_symbol
-| 12 = @ruby_token_heredoc_beginning
-| 13 = @ruby_token_heredoc_content
-| 14 = @ruby_token_heredoc_end
-| 15 = @ruby_token_identifier
-| 16 = @ruby_token_instance_variable
-| 17 = @ruby_token_integer
-| 18 = @ruby_token_nil
-| 19 = @ruby_token_operator
-| 20 = @ruby_token_self
-| 21 = @ruby_token_simple_symbol
-| 22 = @ruby_token_string_content
-| 23 = @ruby_token_super
-| 24 = @ruby_token_true
-| 25 = @ruby_token_uninterpreted
+| 10 = @ruby_token_forward_argument
+| 11 = @ruby_token_forward_parameter
+| 12 = @ruby_token_global_variable
+| 13 = @ruby_token_hash_key_symbol
+| 14 = @ruby_token_heredoc_beginning
+| 15 = @ruby_token_heredoc_content
+| 16 = @ruby_token_heredoc_end
+| 17 = @ruby_token_identifier
+| 18 = @ruby_token_instance_variable
+| 19 = @ruby_token_integer
+| 20 = @ruby_token_nil
+| 21 = @ruby_token_operator
+| 22 = @ruby_token_self
+| 23 = @ruby_token_simple_symbol
+| 24 = @ruby_token_string_content
+| 25 = @ruby_token_super
+| 26 = @ruby_token_true
+| 27 = @ruby_token_uninterpreted
 ;