Merge pull request #270 from yui-knk/move_type_under_grammar

Move `Type` under `Grammar`
ruby · Nov 26, 2023 · 65f1b4f · 65f1b4f
2 parents a49ab82 + b2d9feb
commit 65f1b4f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/lib/lrama.rb b/lib/lrama.rb
@@ -13,6 +13,5 @@
 require "lrama/state"
 require "lrama/states"
 require "lrama/states_reporter"
-require "lrama/type"
 require "lrama/version"
 require "lrama/warning"
diff --git a/lib/lrama/grammar.rb b/lib/lrama/grammar.rb
@@ -9,9 +9,9 @@
 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

diff --git a/lib/lrama/grammar/type.rb b/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
diff --git a/lib/lrama/type.rb b/lib/lrama/type.rb
diff --git a/spec/lrama/parser_spec.rb b/spec/lrama/parser_spec.rb
@@ -1,6 +1,6 @@
 RSpec.describe Lrama::Parser do
   T ||= Lrama::Lexer::Token
-  Type = Lrama::Type
+  Type = Lrama::Grammar::Type
   Sym = Lrama::Grammar::Symbol
   Precedence = Lrama::Grammar::Precedence
   Rule = Lrama::Grammar::Rule