Merge pull request #410 from ydah/parameterizing-meets-named-refs-ali…

…ased Add support for aliased Named References for actions of rhs in Parameterizing rules
ruby · Jun 1, 2024 · df614b4 · df614b4
2 parents 4a07a4f + db76b63
commit df614b4
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 20 deletions.
diff --git a/lib/lrama/grammar/binding.rb b/lib/lrama/grammar/binding.rb
@@ -16,9 +16,18 @@ def resolve_symbol(symbol)
           resolved_args = symbol.args.map { |arg| resolve_symbol(arg) }
           Lrama::Lexer::Token::InstantiateRule.new(s_value: symbol.s_value, location: symbol.location, args: resolved_args, lhs_tag: symbol.lhs_tag)
         else
-          @parameter_to_arg[symbol.s_value] || symbol
+          parameter_to_arg(symbol) || symbol
         end
       end
+
+      private
+
+      def parameter_to_arg(symbol)
+        if (arg = @parameter_to_arg[symbol.s_value].dup)
+          arg.alias_name = symbol.alias_name
+        end
+        arg
+      end
     end
   end
 end
diff --git a/sig/lrama/grammar/binding.rbs b/sig/lrama/grammar/binding.rbs
@@ -10,6 +10,10 @@ module Lrama
 
       def initialize: (Grammar::ParameterizingRule::Rule parameterizing_rule, Array[Lexer::Token] actual_args) -> void
       def resolve_symbol: (Lexer::Token symbol) -> Lexer::Token
+
+      private
+
+      def parameter_to_arg: (Lexer::Token symbol) -> Lexer::Token?
     end
   end
 end
diff --git a/spec/fixtures/parameterizing_rules/user_defined/with_action_and_named_references.y b/spec/fixtures/parameterizing_rules/user_defined/with_action_and_named_references.y
@@ -10,18 +10,16 @@ static int yyerror(YYLTYPE *loc, const char *str);
 
 %union {
     int i;
-    char *s;
 }
 
 %token <i> number
-%token <s> string
 
-%rule pair(X, Y): X ',' Y { printf("(%d, %d)\n", $X, $3); }
-                ;
+%rule sum(X, Y) <i>: X[summand] '+' Y[addend] { $$ = $summand + $addend; }
+             ;
 
 %%
 
-program         : pair(number, string) { printf("pair odd even\n"); }
+program         : sum(number, number) { printf("sum number\n"); }
                 ;
 
 %%

diff --git a/spec/lrama/parser_spec.rb b/spec/lrama/parser_spec.rb
@@ -1692,9 +1692,9 @@
 
             it "expands parameterizing rules" do
               expect(grammar.nterms.sort_by(&:number)).to match_symbols([
-                Sym.new(id: T::Ident.new(s_value: "$accept"), alias_name: nil, number: 6, tag: nil, term: false, token_id: 0, nullable: false),
-                Sym.new(id: T::Ident.new(s_value: "pair_number_string"), alias_name: nil, number: 7, tag: nil, term: false, token_id: 1, nullable: false),
-                Sym.new(id: T::Ident.new(s_value: "program"), alias_name: nil, number: 8, tag: nil, term: false, token_id: 2, nullable: false),
+                Sym.new(id: T::Ident.new(s_value: "$accept"), alias_name: nil, number: 5, tag: nil, term: false, token_id: 0, nullable: false),
+                Sym.new(id: T::Ident.new(s_value: "sum_number_number"), alias_name: nil, number: 6, tag: T::Tag.new(s_value: "<i>"), term: false, token_id: 1, nullable: false),
+                Sym.new(id: T::Ident.new(s_value: "program"), alias_name: nil, number: 7, tag: nil, term: false, token_id: 2, nullable: false),
               ])
 
               expect(grammar.rules).to eq([
@@ -1708,33 +1708,33 @@
                   token_code: nil,
                   nullable: false,
                   precedence_sym: grammar.find_symbol_by_s_value!("YYEOF"),
-                  lineno: 24,
+                  lineno: 22,
                 ),
                 Rule.new(
                   id: 1,
-                  lhs: grammar.find_symbol_by_s_value!("pair_number_string"),
+                  lhs: grammar.find_symbol_by_s_value!("sum_number_number"),
                   rhs: [
                     grammar.find_symbol_by_s_value!("number"),
-                    grammar.find_symbol_by_number!(5),
-                    grammar.find_symbol_by_s_value!("string")
+                    grammar.find_symbol_by_s_value!("'+'"),
+                    grammar.find_symbol_by_s_value!("number")
                   ],
-                  lhs_tag: nil,
-                  token_code: T::UserCode.new(s_value: " printf(\"(%d, %d)\\n\", $X, $3); "),
+                  lhs_tag: T::Tag.new(s_value: "<i>"),
+                  token_code: T::UserCode.new(s_value: " $$ = $summand + $addend; "),
                   nullable: false,
-                  precedence_sym: grammar.find_symbol_by_s_value!("string"),
-                  lineno: 24,
+                  precedence_sym: grammar.find_symbol_by_s_value!("number"),
+                  lineno: 22,
                 ),
                 Rule.new(
                   id: 2,
                   lhs: grammar.find_symbol_by_s_value!("program"),
                   rhs: [
-                    grammar.find_symbol_by_s_value!("pair_number_string"),
+                    grammar.find_symbol_by_s_value!("sum_number_number"),
                   ],
                   lhs_tag: nil,
-                  token_code: T::UserCode.new(s_value: " printf(\"pair odd even\\n\"); "),
+                  token_code: T::UserCode.new(s_value: " printf(\"sum number\\n\"); "),
                   nullable: false,
                   precedence_sym: nil,
-                  lineno: 24,
+                  lineno: 22,
                 ),
               ])
             end