Merge pull request #122 from junk0612/replace-new-parser-2

Replace NewParser With Parser #2

lib/lrama/new_lexer.rb

@@ -64,6 +64,8 @@ def lex_token
         when @scanner.scan(/\/\//)
           @scanner.scan_until(/\n/)
           newline
+        when @scanner.scan(/%empty/)
+          # noop
         else
           break
         end

parser.y

@@ -272,11 +272,11 @@ rule
 
   rhs_list: rhs
               {
-                result = [{rhs: val[0], lineno: val[0].first&.line || @lexer.line}]
+                result = [{rhs: val[0], lineno: val[0].first&.line || @lexer.line - 1}]
               }
           | rhs_list "|" rhs
               {
-                result = val[0].append({rhs: val[2], lineno: val[2].first&.line || @lexer.line})
+                result = val[0].append({rhs: val[2], lineno: val[2].first&.line || @lexer.line - 1})
               }
           | rhs_list ";"
 

spec/lrama/new_parser_spec.rb

@@ -406,7 +406,7 @@
       ])
     end
 
-    xit "nullable" do
+    it "nullable" do
       y = File.read(fixture_path("common/nullable.y"))
       grammar = Lrama::NewParser.new(y).parse