Merge pull request #79 from ydah/extract-struct

Extract Struct into another file

lib/lrama.rb

@@ -10,5 +10,6 @@
 require "lrama/state"
 require "lrama/states"
 require "lrama/states_reporter"
+require "lrama/type"
 require "lrama/version"
 require "lrama/warning"

lib/lrama/grammar.rb

@@ -1,3 +1,4 @@
+require "lrama/grammar/aux"
 require "lrama/grammar/code"
 require "lrama/grammar/error_token"
 require "lrama/grammar/precedence"
@@ -7,16 +8,13 @@
 require "lrama/grammar/symbol"
 require "lrama/grammar/union"
 require "lrama/lexer"
+require "lrama/type"
 
 module Lrama
-  Type = Struct.new(:id, :tag, keyword_init: true)
   Token = Lrama::Lexer::Token
 
   # Grammar is the result of parsing an input grammar file
   class Grammar
-    # Grammar file information not used by States but by Output
-    Aux = Struct.new(:prologue_first_lineno, :prologue, :epilogue_first_lineno, :epilogue, keyword_init: true)
-
     attr_reader :eof_symbol, :error_symbol, :undef_symbol, :accept_symbol, :aux
     attr_accessor :union, :expect,
                   :printers, :error_tokens,

lib/lrama/grammar/aux.rb

@@ -0,0 +1,7 @@
+module Lrama
+  class Grammar
+    # Grammar file information not used by States but by Output
+    class Aux < Struct.new(:prologue_first_lineno, :prologue, :epilogue_first_lineno, :epilogue, keyword_init: true)
+    end
+  end
+end

lib/lrama/lexer/token.rb

@@ -1,7 +1,8 @@
+require 'lrama/lexer/token/type'
+
 module Lrama
   class Lexer
-    class Token < Struct.new(:type, :s_value, :alias, keyword_init: true)
-      Type = Struct.new(:id, :name, keyword_init: true)
+    class Token
 
       attr_accessor :line, :column, :referred
       # For User_code

lib/lrama/lexer/token/type.rb

@@ -0,0 +1,8 @@
+module Lrama
+  class Lexer
+    class Token < Struct.new(:type, :s_value, :alias, keyword_init: true)
+      class Type < Struct.new(:id, :name, keyword_init: true)
+      end
+    end
+  end
+end

lib/lrama/type.rb

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