Merge pull request #401 from ydah/add-support-rhs

Add support for RHS of user-defined parameterizing rules contain `symbol? `, `symbol+`, and `symbol*`
ruby · Apr 28, 2024 · 62a94f9 · 62a94f9
2 parents 2a0ac76 + 2800d94
commit 62a94f9
Show file tree

Hide file tree

Showing 4 changed files with 158 additions and 96 deletions.
diff --git a/lib/lrama/parser.rb b/lib/lrama/parser.rb
diff --git a/parser.y b/parser.y
@@ -276,7 +276,7 @@ rule
               builder.symbols << token
               result = builder
             }
-          | rule_rhs IDENTIFIER parameterizing_suffix
+          | rule_rhs symbol parameterizing_suffix
               {
                 builder = val[0]
                 builder.symbols << Lrama::Lexer::Token::InstantiateRule.new(s_value: val[2], location: @lexer.location, args: [val[1]])

diff --git a/spec/fixtures/parameterizing_rules/user_defined_with_nest.y b/spec/fixtures/parameterizing_rules/user_defined_with_nest.y
@@ -37,10 +37,15 @@ static int yyerror(YYLTYPE *loc, const char *str);
                         | nested_multi_option(Y) X
                         ;
 
+%rule with_word_seps(X): /* empty */
+                   | X ' '+
+                   ;
+
 %%
 
 program         : option(number)
                 | multi_option(number, string)
+                | with_word_seps(string)
                 ;
 
 %%