Merge pull request #414 from ydah/parameterizing-result-meets-named-r…

…efs-aliased Add support for Named Reference in parameterizing rules callers
ruby · May 27, 2024 · 4a07a4f · 4a07a4f
2 parents bc2f0b4 + effe94a
commit 4a07a4f
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 68 deletions.
diff --git a/lib/lrama/parser.rb b/lib/lrama/parser.rb
diff --git a/parser.y b/parser.y
@@ -444,17 +444,17 @@ rule
            builder.add_rhs(token)
            result = builder
          }
-     | rhs symbol parameterizing_suffix TAG?
+     | rhs symbol parameterizing_suffix named_ref_opt TAG?
          {
-           token = Lrama::Lexer::Token::InstantiateRule.new(s_value: val[2], location: @lexer.location, args: [val[1]], lhs_tag: val[3])
+           token = Lrama::Lexer::Token::InstantiateRule.new(s_value: val[2], alias_name: val[3], location: @lexer.location, args: [val[1]], lhs_tag: val[4])
            builder = val[0]
            builder.add_rhs(token)
            builder.line = val[1].first_line
            result = builder
          }
-     | rhs IDENTIFIER "(" parameterizing_args ")" TAG?
+     | rhs IDENTIFIER "(" parameterizing_args ")" named_ref_opt TAG?
          {
-           token = Lrama::Lexer::Token::InstantiateRule.new(s_value: val[1].s_value, location: @lexer.location, args: val[3], lhs_tag: val[5])
+           token = Lrama::Lexer::Token::InstantiateRule.new(s_value: val[1].s_value, alias_name: val[5], location: @lexer.location, args: val[3], lhs_tag: val[6])
            builder = val[0]
            builder.add_rhs(token)
            builder.line = val[1].first_line

diff --git a/spec/fixtures/integration/parameterizing_rules.y b/spec/fixtures/integration/parameterizing_rules.y
@@ -15,11 +15,13 @@ static int yyerror(YYLTYPE *loc, const char *str);
 
 %union {
     int num;
+    char* str;
 }
 
 %token <num> ODD EVEN
 
 %type <num> stmt
+%type <str> opt_nl
 
 %%
 
@@ -33,7 +35,7 @@ stmt: ODD opt_nl { printf("odd: %d\n", $1); }
     | EVEN opt_semicolon { printf("even: %d\n", $1); }
     ;
 
-opt_nl: '\n'?
+opt_nl: '\n'?[nl] <str> { $$ = $nl; }
       ;
 
 opt_semicolon: semicolon?

diff --git a/spec/fixtures/integration/user_defined_parameterizing_rules.y b/spec/fixtures/integration/user_defined_parameterizing_rules.y
@@ -39,7 +39,7 @@ stmts: separated_list(';', stmt)
      ;
 
 stmt: pair(ODD, EVEN) <num> { printf("pair odd even: %d\n", $1); }
-    | pair(EVEN, ODD) <num> { printf("pair even odd: %d\n", $1); }
+    | pair(EVEN, ODD)[result] <num> { printf("pair even odd: %d\n", $result); }
     ;
 
 %%
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,7 +39,7 @@ stmts: separated_list(';', stmt) @@
          ;
     stmt: pair(ODD, EVEN) <num> { printf("pair odd even: %d\n", $1); }
-        | pair(EVEN, ODD) <num> { printf("pair even odd: %d\n", $1); }
+        | pair(EVEN, ODD)[result] <num> { printf("pair even odd: %d\n", $result); }
         ;
     %%
@@ Expand Down @@