lrama 0.5.10 → 0.5.12

data/lib/lrama/grammar/symbol.rb

@@ -6,10 +6,23 @@
 
 module Lrama
   class Grammar
-    class Symbol < Struct.new(:id, :alias_name, :number, :tag, :term, :token_id, :nullable, :precedence, :printer, :error_token, keyword_init: true)
-      attr_accessor :first_set, :first_set_bitmap
+    class Symbol
+      attr_accessor :id, :alias_name, :tag, :number, :token_id, :nullable, :precedence, :printer, :error_token, :first_set, :first_set_bitmap
+      attr_reader :term
       attr_writer :eof_symbol, :error_symbol, :undef_symbol, :accept_symbol
 
+      def initialize(id:, alias_name: nil, number: nil, tag: nil, term:, token_id: nil, nullable: nil, precedence: nil, printer: nil)
+        @id = id
+        @alias_name = alias_name
+        @number = number
+        @tag = tag
+        @term = term
+        @token_id = token_id
+        @nullable = nullable
+        @precedence = precedence
+        @printer = printer
+      end
+
       def term?
         term
       end
@@ -41,6 +54,7 @@ module Lrama
       # name for yysymbol_kind_t
       #
       # See: b4_symbol_kind_base
+      # @type var name: String
       def enum_name
         case
         when accept_symbol?

data/lib/lrama/grammar/type.rb

@@ -0,0 +1,6 @@
+module Lrama
+  class Grammar
+    class Type < Struct.new(:id, :tag, keyword_init: true)
+    end
+  end
+end

data/lib/lrama/grammar.rb

@@ -9,9 +9,9 @@ require "lrama/grammar/reference"
 require "lrama/grammar/rule"
 require "lrama/grammar/rule_builder"
 require "lrama/grammar/symbol"
+require "lrama/grammar/type"
 require "lrama/grammar/union"
 require "lrama/lexer"
-require "lrama/type"
 
 module Lrama
   # Grammar is the result of parsing an input grammar file
@@ -148,7 +148,7 @@ module Lrama
     def prepare
       normalize_rules
       collect_symbols
-      replace_token_with_symbol
+      set_lhs_and_rhs
       fill_symbol_number
       fill_default_precedence
       fill_sym_to_rules
@@ -391,6 +391,11 @@ module Lrama
           @rules << rule
         end
 
+        builder.parameterizing_rules.each do |rule|
+          add_nterm(id: rule._lhs, tag: rule.lhs_tag)
+          @rules << rule
+        end
+
         builder.midrule_action_rules.each do |rule|
           add_nterm(id: rule._lhs)
         end
@@ -484,7 +489,7 @@ module Lrama
       end
     end
 
-    def replace_token_with_symbol
+    def set_lhs_and_rhs
       @rules.each do |rule|
         rule.lhs = token_to_symbol(rule._lhs) if rule._lhs
 

data/lib/lrama/lexer/token/parameterizing.rb

@@ -4,7 +4,7 @@ module Lrama
       class Parameterizing < Token
         attr_accessor :args
 
-        def initialize(s_value: nil, alias_name: nil, location: nil, args: [])
+        def initialize(s_value:, alias_name: nil, location: nil, args: [])
           super s_value: s_value, alias_name: alias_name, location: location
           @args = args
         end

data/lib/lrama/lexer/token.rb

@@ -1,8 +1,21 @@
+require 'lrama/lexer/token/char'
+require 'lrama/lexer/token/ident'
+require 'lrama/lexer/token/parameterizing'
+require 'lrama/lexer/token/tag'
+require 'lrama/lexer/token/user_code'
+
 module Lrama
   class Lexer
-    class Token < Struct.new(:s_value, :alias_name, :location, keyword_init: true)
-
-      attr_accessor :referred
+    class Token
+      attr_reader :s_value, :location
+      attr_accessor :alias_name, :referred
+
+      def initialize(s_value:, alias_name: nil, location: nil)
+        s_value.freeze
+        @s_value = s_value
+        @alias_name = alias_name
+        @location = location
+      end
 
       def to_s
         "#{super} location: #{location}"
@@ -36,9 +49,3 @@ module Lrama
     end
   end
 end
-
-require 'lrama/lexer/token/char'
-require 'lrama/lexer/token/ident'
-require 'lrama/lexer/token/parameterizing'
-require 'lrama/lexer/token/tag'
-require 'lrama/lexer/token/user_code'

data/lib/lrama/lexer.rb

@@ -157,8 +157,7 @@ module Lrama
       while !@scanner.eos? do
         case
         when @scanner.scan(/\n/)
-          @line += 1
-          @head = @scanner.pos + 1
+          newline
         when @scanner.scan(/\*\//)
           return
         else