Merge pull request ruby#381 from ydah/fix-user-defined-action

Fix an issue in a user-defined parameterizing rule where the caller cannot access `$$` in the rule
jinroq · Feb 28, 2024 · 85b2fe2 · 85b2fe2
2 parents d41440e + 4bc6930
commit 85b2fe2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 75 deletions.
diff --git a/lib/lrama/grammar/rule_builder.rb b/lib/lrama/grammar/rule_builder.rb
@@ -115,12 +115,12 @@ def process_rhs(parameterizing_rule_resolver)
               @replaced_rhs << lhs_token
               parameterizing_rule_resolver.created_lhs_list << lhs_token
               parameterizing_rule.rhs_list.each do |r|
-                rule_builder = RuleBuilder.new(@rule_counter, @midrule_action_counter, i, lhs_tag: token.lhs_tag, skip_preprocess_references: true)
+                rule_builder = RuleBuilder.new(@rule_counter, @midrule_action_counter, lhs_tag: token.lhs_tag, skip_preprocess_references: true)
                 rule_builder.lhs = lhs_token
                 r.symbols.each { |sym| rule_builder.add_rhs(bindings.resolve_symbol(sym)) }
                 rule_builder.line = line
-                rule_builder.user_code = r.user_code
                 rule_builder.precedence_sym = r.precedence_sym
+                rule_builder.user_code = r.user_code
                 rule_builder.complete_input
                 rule_builder.setup_rules(parameterizing_rule_resolver)
                 @rule_builders_for_parameterizing_rules << rule_builder

diff --git a/spec/lrama/integration_spec.rb b/spec/lrama/integration_spec.rb
@@ -91,7 +91,7 @@ def generate_object(grammar_file_path, c_path, obj_path, command_args: [])
     it "prints messages corresponding to rules" do
       expected = <<~STR
         (2, 3)
-        pair even odd: 2
+        pair even odd: 5
         (1, 0)
         pair odd even: 1
       STR