Update parser

ruby · Sep 25, 2023 · 3972ed8 · 3972ed8
1 parent acf5589
commit 3972ed8
Show file tree

Hide file tree

Showing 5 changed files with 372 additions and 283 deletions.
diff --git a/lib/lrama/grammar.rb b/lib/lrama/grammar.rb
@@ -309,7 +309,7 @@ def nterms
     def extract_references
       @_rules.each do |lhs, rhs, _|
         rhs.each_with_index do |token, index|
-          next if token.type != Lrama::Lexer::Token::User_code
+          next if token.class == Lrama::Grammar::Symbol || token.type != Lrama::Lexer::Token::User_code
 
           scanner = StringScanner.new(token.s_value)
           references = []

diff --git a/lib/lrama/new_lexer.rb b/lib/lrama/new_lexer.rb
@@ -100,7 +100,9 @@ def lex_c_code
           @line += 1
           @head = @scanner.pos + 1
         when @scanner.scan(/"/)
-          code += %Q("#{@scanner.scan_until(/"/)[0..-2]}")
+          matched = @scanner.scan_until(/"/)[0..-2]
+          code += %Q("#{matched}")
+          @line += matched.count("\n")
         else
           code += @scanner.getch
         end