Merge pull request #184 from ydah/extract-methods

Extract Parameterizing method
ruby · Nov 4, 2023 · c4a9cfe · c4a9cfe
2 parents dc1ad3c + 64603eb
commit c4a9cfe
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/lib/lrama/grammar.rb b/lib/lrama/grammar.rb
@@ -583,19 +583,19 @@ def normalize_rules
 
     def expand_parameterizing_rules(lhs, rhs, code, precedence_sym, lineno)
       token = Lrama::Lexer::Token::Ident.new(s_value: rhs[0].s_value)
-      if rhs.any? {|r| r.is_a?(Lrama::Lexer::Token::Parameterizing) && r.s_value == "?" }
+      if rhs.any? {|r| r.is_a?(Lrama::Lexer::Token::Parameterizing) && r.option? }
         option_token = Lrama::Lexer::Token::Ident.new(s_value: "option_#{rhs[0].s_value}")
         add_term(id: option_token)
         @rules << Rule.new(id: @rules.count, lhs: lhs, rhs: [option_token], code: code, precedence_sym: precedence_sym, lineno: lineno)
         @rules << Rule.new(id: @rules.count, lhs: option_token, rhs: [], code: code, precedence_sym: precedence_sym, lineno: lineno)
         @rules << Rule.new(id: @rules.count, lhs: option_token, rhs: [token], code: code, precedence_sym: precedence_sym, lineno: lineno)
-      elsif rhs.any? {|r| r.is_a?(Lrama::Lexer::Token::Parameterizing) && r.s_value == "+" }
+      elsif rhs.any? {|r| r.is_a?(Lrama::Lexer::Token::Parameterizing) && r.nonempty_list? }
         nonempty_list_token = Lrama::Lexer::Token::Ident.new(s_value: "nonempty_list_#{rhs[0].s_value}")
         add_term(id: nonempty_list_token)
         @rules << Rule.new(id: @rules.count, lhs: lhs, rhs: [nonempty_list_token], code: code, precedence_sym: precedence_sym, lineno: lineno)
         @rules << Rule.new(id: @rules.count, lhs: nonempty_list_token, rhs: [token], code: code, precedence_sym: precedence_sym, lineno: lineno)
         @rules << Rule.new(id: @rules.count, lhs: nonempty_list_token, rhs: [nonempty_list_token, token], code: code, precedence_sym: precedence_sym, lineno: lineno)
-      elsif rhs.any? {|r| r.is_a?(Lrama::Lexer::Token::Parameterizing) && r.s_value == "*" }
+      elsif rhs.any? {|r| r.is_a?(Lrama::Lexer::Token::Parameterizing) && r.list? }
         list_token = Lrama::Lexer::Token::Ident.new(s_value: "list_#{rhs[0].s_value}")
         add_term(id: list_token)
         @rules << Rule.new(id: @rules.count, lhs: lhs, rhs: [list_token], code: code, precedence_sym: precedence_sym, lineno: lineno)

diff --git a/lib/lrama/lexer/token/parameterizing.rb b/lib/lrama/lexer/token/parameterizing.rb
@@ -2,6 +2,17 @@ module Lrama
   class Lexer
     class Token
       class Parameterizing < Token
+        def option?
+          self.s_value == "?"
+        end
+
+        def nonempty_list?
+          self.s_value == "+"
+        end
+
+        def list?
+          self.s_value == "*"
+        end
       end
     end
   end