Ruby: regenerate dbscheme and library

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

@@ -59,6 +59,8 @@ module Ruby {
 
   class UnderscoreMethodName extends @ruby_underscore_method_name, AstNode { }
 
+  class UnderscoreNonlocalVariable extends @ruby_underscore_nonlocal_variable, AstNode { }
+
   class UnderscorePatternConstant extends @ruby_underscore_pattern_constant, AstNode { }
 
   class UnderscorePatternExpr extends @ruby_underscore_pattern_expr, AstNode { }
@@ -365,13 +367,13 @@ module Ruby {
     override string getAPrimaryQlClass() { result = "BlockArgument" }
 
     /** Gets the location of this element. */
-    override L::Location getLocation() { ruby_block_argument_def(this, _, result) }
+    override L::Location getLocation() { ruby_block_argument_def(this, result) }
 
     /** Gets the child of this node. */
-    UnderscoreArg getChild() { ruby_block_argument_def(this, result, _) }
+    UnderscoreArg getChild() { ruby_block_argument_child(this, result) }
 
     /** Gets a field or child node of this node. */
-    override AstNode getAFieldOrChild() { ruby_block_argument_def(this, result, _) }
+    override AstNode getAFieldOrChild() { ruby_block_argument_child(this, result) }
   }
 
   /** A class representing `block_parameter` nodes. */
@@ -380,13 +382,13 @@ module Ruby {
     override string getAPrimaryQlClass() { result = "BlockParameter" }
 
     /** Gets the location of this element. */
-    override L::Location getLocation() { ruby_block_parameter_def(this, _, result) }
+    override L::Location getLocation() { ruby_block_parameter_def(this, result) }
 
     /** Gets the node corresponding to the field `name`. */
-    Identifier getName() { ruby_block_parameter_def(this, result, _) }
+    Identifier getName() { ruby_block_parameter_name(this, result) }
 
     /** Gets a field or child node of this node. */
-    override AstNode getAFieldOrChild() { ruby_block_parameter_def(this, result, _) }
+    override AstNode getAFieldOrChild() { ruby_block_parameter_name(this, result) }
   }
 
   /** A class representing `block_parameters` nodes. */
@@ -806,6 +808,21 @@ module Ruby {
     override AstNode getAFieldOrChild() { ruby_exceptions_child(this, _, result) }
   }
 
+  /** A class representing `expression_reference_pattern` nodes. */
+  class ExpressionReferencePattern extends @ruby_expression_reference_pattern, AstNode {
+    /** Gets the name of the primary QL class for this element. */
+    override string getAPrimaryQlClass() { result = "ExpressionReferencePattern" }
+
+    /** Gets the location of this element. */
+    override L::Location getLocation() { ruby_expression_reference_pattern_def(this, _, result) }
+
+    /** Gets the node corresponding to the field `value`. */
+    UnderscoreExpression getValue() { ruby_expression_reference_pattern_def(this, result, _) }
+
+    /** Gets a field or child node of this node. */
+    override AstNode getAFieldOrChild() { ruby_expression_reference_pattern_def(this, result, _) }
+  }
+
   /** A class representing `false` tokens. */
   class False extends @ruby_token_false, Token {
     /** Gets the name of the primary QL class for this element. */
@@ -1392,17 +1409,17 @@ module Ruby {
     override string getAPrimaryQlClass() { result = "Pair" }
 
     /** Gets the location of this element. */
-    override L::Location getLocation() { ruby_pair_def(this, _, _, result) }
+    override L::Location getLocation() { ruby_pair_def(this, _, result) }
 
     /** Gets the node corresponding to the field `key`. */
-    AstNode getKey() { ruby_pair_def(this, result, _, _) }
+    AstNode getKey() { ruby_pair_def(this, result, _) }
 
     /** Gets the node corresponding to the field `value`. */
-    UnderscoreArg getValue() { ruby_pair_def(this, _, result, _) }
+    UnderscoreArg getValue() { ruby_pair_value(this, result) }
 
     /** Gets a field or child node of this node. */
     override AstNode getAFieldOrChild() {
-      ruby_pair_def(this, result, _, _) or ruby_pair_def(this, _, result, _)
+      ruby_pair_def(this, result, _) or ruby_pair_value(this, result)
     }
   }
 
@@ -2041,7 +2058,7 @@ module Ruby {
     override L::Location getLocation() { ruby_variable_reference_pattern_def(this, _, result) }
 
     /** Gets the node corresponding to the field `name`. */
-    Identifier getName() { ruby_variable_reference_pattern_def(this, result, _) }
+    AstNode getName() { ruby_variable_reference_pattern_def(this, result, _) }
 
     /** Gets a field or child node of this node. */
     override AstNode getAFieldOrChild() { ruby_variable_reference_pattern_def(this, result, _) }

ruby/ql/lib/ruby.dbscheme

@@ -56,13 +56,15 @@ case @diagnostic.severity of
 
 @ruby_underscore_lhs = @ruby_call | @ruby_element_reference | @ruby_scope_resolution | @ruby_token_false | @ruby_token_nil | @ruby_token_true | @ruby_underscore_variable
 
-@ruby_underscore_method_name = @ruby_delimited_symbol | @ruby_setter | @ruby_token_class_variable | @ruby_token_constant | @ruby_token_global_variable | @ruby_token_identifier | @ruby_token_instance_variable | @ruby_token_operator | @ruby_token_simple_symbol
+@ruby_underscore_method_name = @ruby_delimited_symbol | @ruby_setter | @ruby_token_constant | @ruby_token_identifier | @ruby_token_operator | @ruby_token_simple_symbol | @ruby_underscore_nonlocal_variable
+
+@ruby_underscore_nonlocal_variable = @ruby_token_class_variable | @ruby_token_global_variable | @ruby_token_instance_variable
 
 @ruby_underscore_pattern_constant = @ruby_scope_resolution | @ruby_token_constant
 
 @ruby_underscore_pattern_expr = @ruby_alternative_pattern | @ruby_as_pattern | @ruby_underscore_pattern_expr_basic
 
-@ruby_underscore_pattern_expr_basic = @ruby_array_pattern | @ruby_find_pattern | @ruby_hash_pattern | @ruby_parenthesized_pattern | @ruby_range | @ruby_token_identifier | @ruby_underscore_pattern_constant | @ruby_underscore_pattern_primitive | @ruby_variable_reference_pattern
+@ruby_underscore_pattern_expr_basic = @ruby_array_pattern | @ruby_expression_reference_pattern | @ruby_find_pattern | @ruby_hash_pattern | @ruby_parenthesized_pattern | @ruby_range | @ruby_token_identifier | @ruby_underscore_pattern_constant | @ruby_underscore_pattern_primitive | @ruby_variable_reference_pattern
 
 @ruby_underscore_pattern_primitive = @ruby_delimited_symbol | @ruby_lambda | @ruby_regex | @ruby_string__ | @ruby_string_array | @ruby_symbol_array | @ruby_token_encoding | @ruby_token_false | @ruby_token_file | @ruby_token_line | @ruby_token_nil | @ruby_token_self | @ruby_token_simple_symbol | @ruby_token_true | @ruby_unary | @ruby_underscore_simple_numeric
 
@@ -74,7 +76,7 @@ case @diagnostic.severity of
 
 @ruby_underscore_statement = @ruby_alias | @ruby_begin_block | @ruby_end_block | @ruby_if_modifier | @ruby_rescue_modifier | @ruby_undef | @ruby_underscore_expression | @ruby_unless_modifier | @ruby_until_modifier | @ruby_while_modifier
 
-@ruby_underscore_variable = @ruby_token_class_variable | @ruby_token_constant | @ruby_token_global_variable | @ruby_token_identifier | @ruby_token_instance_variable | @ruby_token_self | @ruby_token_super
+@ruby_underscore_variable = @ruby_token_constant | @ruby_token_identifier | @ruby_token_self | @ruby_token_super | @ruby_underscore_nonlocal_variable
 
 ruby_alias_def(
   unique int id: @ruby_alias,
@@ -272,15 +274,23 @@ ruby_block_def(
   int loc: @location ref
 );
 
+ruby_block_argument_child(
+  unique int ruby_block_argument: @ruby_block_argument ref,
+  unique int child: @ruby_underscore_arg ref
+);
+
 ruby_block_argument_def(
   unique int id: @ruby_block_argument,
-  int child: @ruby_underscore_arg ref,
   int loc: @location ref
 );
 
+ruby_block_parameter_name(
+  unique int ruby_block_parameter: @ruby_block_parameter ref,
+  unique int name: @ruby_token_identifier ref
+);
+
 ruby_block_parameter_def(
   unique int id: @ruby_block_parameter,
-  int name: @ruby_token_identifier ref,
   int loc: @location ref
 );
 
@@ -584,6 +594,12 @@ ruby_exceptions_def(
   int loc: @location ref
 );
 
+ruby_expression_reference_pattern_def(
+  unique int id: @ruby_expression_reference_pattern,
+  int value: @ruby_underscore_expression ref,
+  int loc: @location ref
+);
+
 ruby_find_pattern_class(
   unique int ruby_find_pattern: @ruby_find_pattern ref,
   unique int class: @ruby_underscore_pattern_constant ref
@@ -905,10 +921,14 @@ ruby_optional_parameter_def(
 
 @ruby_pair_key_type = @ruby_string__ | @ruby_token_hash_key_symbol | @ruby_underscore_arg
 
+ruby_pair_value(
+  unique int ruby_pair: @ruby_pair ref,
+  unique int value: @ruby_underscore_arg ref
+);
+
 ruby_pair_def(
   unique int id: @ruby_pair,
   int key__: @ruby_pair_key_type ref,
-  int value: @ruby_underscore_arg ref,
   int loc: @location ref
 );
 
@@ -1308,9 +1328,11 @@ ruby_until_modifier_def(
   int loc: @location ref
 );
 
+@ruby_variable_reference_pattern_name_type = @ruby_token_identifier | @ruby_underscore_nonlocal_variable
+
 ruby_variable_reference_pattern_def(
   unique int id: @ruby_variable_reference_pattern,
-  int name: @ruby_token_identifier ref,
+  int name: @ruby_variable_reference_pattern_name_type ref,
   int loc: @location ref
 );
 
@@ -1398,7 +1420,7 @@ case @ruby_token.kind of
 ;
 
 
-@ruby_ast_node = @ruby_alias | @ruby_alternative_pattern | @ruby_argument_list | @ruby_array | @ruby_array_pattern | @ruby_as_pattern | @ruby_assignment | @ruby_bare_string | @ruby_bare_symbol | @ruby_begin | @ruby_begin_block | @ruby_binary | @ruby_block | @ruby_block_argument | @ruby_block_parameter | @ruby_block_parameters | @ruby_break | @ruby_call | @ruby_case__ | @ruby_case_match | @ruby_chained_string | @ruby_class | @ruby_conditional | @ruby_delimited_symbol | @ruby_destructured_left_assignment | @ruby_destructured_parameter | @ruby_do | @ruby_do_block | @ruby_element_reference | @ruby_else | @ruby_elsif | @ruby_end_block | @ruby_ensure | @ruby_exception_variable | @ruby_exceptions | @ruby_find_pattern | @ruby_for | @ruby_hash | @ruby_hash_pattern | @ruby_hash_splat_argument | @ruby_hash_splat_parameter | @ruby_heredoc_body | @ruby_if | @ruby_if_guard | @ruby_if_modifier | @ruby_in | @ruby_in_clause | @ruby_interpolation | @ruby_keyword_parameter | @ruby_keyword_pattern | @ruby_lambda | @ruby_lambda_parameters | @ruby_left_assignment_list | @ruby_method | @ruby_method_parameters | @ruby_module | @ruby_next | @ruby_operator_assignment | @ruby_optional_parameter | @ruby_pair | @ruby_parenthesized_pattern | @ruby_parenthesized_statements | @ruby_pattern | @ruby_program | @ruby_range | @ruby_rational | @ruby_redo | @ruby_regex | @ruby_rescue | @ruby_rescue_modifier | @ruby_rest_assignment | @ruby_retry | @ruby_return | @ruby_right_assignment_list | @ruby_scope_resolution | @ruby_setter | @ruby_singleton_class | @ruby_singleton_method | @ruby_splat_argument | @ruby_splat_parameter | @ruby_string__ | @ruby_string_array | @ruby_subshell | @ruby_superclass | @ruby_symbol_array | @ruby_then | @ruby_token | @ruby_unary | @ruby_undef | @ruby_unless | @ruby_unless_guard | @ruby_unless_modifier | @ruby_until | @ruby_until_modifier | @ruby_variable_reference_pattern | @ruby_when | @ruby_while | @ruby_while_modifier | @ruby_yield
+@ruby_ast_node = @ruby_alias | @ruby_alternative_pattern | @ruby_argument_list | @ruby_array | @ruby_array_pattern | @ruby_as_pattern | @ruby_assignment | @ruby_bare_string | @ruby_bare_symbol | @ruby_begin | @ruby_begin_block | @ruby_binary | @ruby_block | @ruby_block_argument | @ruby_block_parameter | @ruby_block_parameters | @ruby_break | @ruby_call | @ruby_case__ | @ruby_case_match | @ruby_chained_string | @ruby_class | @ruby_conditional | @ruby_delimited_symbol | @ruby_destructured_left_assignment | @ruby_destructured_parameter | @ruby_do | @ruby_do_block | @ruby_element_reference | @ruby_else | @ruby_elsif | @ruby_end_block | @ruby_ensure | @ruby_exception_variable | @ruby_exceptions | @ruby_expression_reference_pattern | @ruby_find_pattern | @ruby_for | @ruby_hash | @ruby_hash_pattern | @ruby_hash_splat_argument | @ruby_hash_splat_parameter | @ruby_heredoc_body | @ruby_if | @ruby_if_guard | @ruby_if_modifier | @ruby_in | @ruby_in_clause | @ruby_interpolation | @ruby_keyword_parameter | @ruby_keyword_pattern | @ruby_lambda | @ruby_lambda_parameters | @ruby_left_assignment_list | @ruby_method | @ruby_method_parameters | @ruby_module | @ruby_next | @ruby_operator_assignment | @ruby_optional_parameter | @ruby_pair | @ruby_parenthesized_pattern | @ruby_parenthesized_statements | @ruby_pattern | @ruby_program | @ruby_range | @ruby_rational | @ruby_redo | @ruby_regex | @ruby_rescue | @ruby_rescue_modifier | @ruby_rest_assignment | @ruby_retry | @ruby_return | @ruby_right_assignment_list | @ruby_scope_resolution | @ruby_setter | @ruby_singleton_class | @ruby_singleton_method | @ruby_splat_argument | @ruby_splat_parameter | @ruby_string__ | @ruby_string_array | @ruby_subshell | @ruby_superclass | @ruby_symbol_array | @ruby_then | @ruby_token | @ruby_unary | @ruby_undef | @ruby_unless | @ruby_unless_guard | @ruby_unless_modifier | @ruby_until | @ruby_until_modifier | @ruby_variable_reference_pattern | @ruby_when | @ruby_while | @ruby_while_modifier | @ruby_yield
 
 @ruby_ast_node_parent = @file | @ruby_ast_node