[WIP] Support nested parameterizing rules

lib/lrama/grammar.rb

@@ -489,8 +489,8 @@ def replace_token_with_symbol
         rule.lhs = token_to_symbol(rule._lhs) if rule._lhs
 
         rule.rhs = rule._rhs.map do |t|
-          token_to_symbol(t)
-        end
+          token_to_symbol(t) unless t.is_a?(Lrama::Lexer::Token::Parameterizing)
+        end.compact
       end
     end
 

lib/lrama/grammar/parameterizing_rules/builder.rb

@@ -31,12 +31,33 @@ def initialize(token, rule_counter, lhs, user_code, precedence_sym, line)
         end
 
         def build
-          if RULES.key?(@key)
-            RULES[@key].new(@token, @rule_counter, @lhs, @user_code, @precedence_sym, @line).build
-          else
+          validate_key!
+
+          rules = inside_rules
+          s_value = if rules.empty?
+                      @token.args.first.s_value
+                    else
+                      rules.last._lhs.s_value
+                    end
+          rules << RULES[@key].new(@token.args, s_value, @rule_counter, @lhs, @user_code, @precedence_sym, @line).build
+          rules.flatten
+        end
+
+        private
+
+        def validate_key!
+          unless RULES.key?(@key)
             raise "Parameterizing rule does not exist. `#{@key}`"
           end
         end
+
+        def inside_rules
+          if @token.args.any? { |arg| arg.is_a?(Lrama::Lexer::Token::Parameterizing) }
+            ParameterizingRules::Builder.new(@token.args.first, @rule_counter, @lhs, @user_code, @precedence_sym, @line).build
+          else
+            []
+          end
+        end
       end
     end
   end

lib/lrama/grammar/parameterizing_rules/builder/base.rb

@@ -3,9 +3,10 @@ class Grammar
     class ParameterizingRules
       class Builder
         class Base
-          def initialize(token, rule_counter, lhs, user_code, precedence_sym, line)
-            @args = token.args
+          def initialize(args, s_value, rule_counter, lhs, user_code, precedence_sym, line)
+            @args = args
             @token = @args.first
+            @s_value = s_value
             @rule_counter = rule_counter
             @lhs = lhs
             @user_code = user_code

lib/lrama/grammar/parameterizing_rules/builder/list.rb

@@ -7,7 +7,7 @@ def build
             validate_argument_number!
 
             rules = []
-            list_token = Lrama::Lexer::Token::Ident.new(s_value: "list_#{@token.s_value}")
+            list_token = Lrama::Lexer::Token::Ident.new(s_value: "list_#{@s_value}")
             rules << Rule.new(id: @rule_counter.increment, _lhs: @lhs, _rhs: [list_token], token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
             rules << Rule.new(id: @rule_counter.increment, _lhs: list_token, _rhs: [], token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
             rules << Rule.new(id: @rule_counter.increment, _lhs: list_token, _rhs: [list_token, @token], token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)

lib/lrama/grammar/parameterizing_rules/builder/nonempty_list.rb

@@ -7,7 +7,7 @@ def build
             validate_argument_number!
 
             rules = []
-            nonempty_list_token = Lrama::Lexer::Token::Ident.new(s_value: "nonempty_list_#{@token.s_value}")
+            nonempty_list_token = Lrama::Lexer::Token::Ident.new(s_value: "nonempty_list_#{@s_value}")
             rules << Rule.new(id: @rule_counter.increment, _lhs: @lhs, _rhs: [nonempty_list_token], token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
             rules << Rule.new(id: @rule_counter.increment, _lhs: nonempty_list_token, _rhs: [@token], token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
             rules << Rule.new(id: @rule_counter.increment, _lhs: nonempty_list_token, _rhs: [nonempty_list_token, @token], token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)

lib/lrama/grammar/parameterizing_rules/builder/option.rb

@@ -7,7 +7,7 @@ def build
             validate_argument_number!
 
             rules = []
-            option_token = Lrama::Lexer::Token::Ident.new(s_value: "option_#{@token.s_value}")
+            option_token = Lrama::Lexer::Token::Ident.new(s_value: "option_#{@s_value}")
             rules << Rule.new(id: @rule_counter.increment, _lhs: @lhs, _rhs: [option_token], token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
             rules << Rule.new(id: @rule_counter.increment, _lhs: option_token, _rhs: [], token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
             rules << Rule.new(id: @rule_counter.increment, _lhs: option_token, _rhs: [@token], token_code: @ser_code, precedence_sym: @precedence_sym, lineno: @line)

lib/lrama/grammar/parameterizing_rules/builder/separated_list.rb

@@ -14,7 +14,7 @@ def build
             validate_argument_number!
 
             rules = []
-            separated_list_token = Lrama::Lexer::Token::Ident.new(s_value: "separated_list_#{@token.s_value}")
+            separated_list_token = Lrama::Lexer::Token::Ident.new(s_value: "separated_list_#{@s_value}")
             rules << Rule.new(id: @rule_counter.increment, _lhs: @lhs, _rhs: [separated_list_token], token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
             rules << Rule.new(id: @rule_counter.increment, _lhs: separated_list_token, _rhs: [], token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
             rules << Rule.new(id: @rule_counter.increment, _lhs: separated_list_token, _rhs: [@token], token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)

lib/lrama/grammar/parameterizing_rules/builder/separated_nonempty_list.rb

@@ -14,7 +14,7 @@ def build
             validate_argument_number!
 
             rules = []
-            separated_list_token = Lrama::Lexer::Token::Ident.new(s_value: "separated_nonempty_list_#{@token.s_value}")
+            separated_list_token = Lrama::Lexer::Token::Ident.new(s_value: "separated_nonempty_list_#{@s_value}")
             rules << Rule.new(id: @rule_counter.increment, _lhs: @lhs, _rhs: [separated_list_token], token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
             rules << Rule.new(id: @rule_counter.increment, _lhs: separated_list_token, _rhs: [@token], token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
             rules << Rule.new(id: @rule_counter.increment, _lhs: separated_list_token, _rhs: [separated_list_token, @separator, @token], token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)

lib/lrama/grammar/rule_builder.rb

@@ -83,7 +83,7 @@ def build_rules
 
         # Expand Parameterizing rules
         if tokens.any? {|r| r.is_a?(Lrama::Lexer::Token::Parameterizing) }
-          @rules = @parameterizing_rules
+          @rules = parameterizing_rules
           @midrule_action_rules = []
         else
           rule = Rule.new(