Merge pull request #134 from junk0612/replace-new-parser-5

Replace NewParser with Parser #5
ruby · Oct 17, 2023 · 15c3e0d · 15c3e0d
2 parents da4a6cd + 80de546
commit 15c3e0d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/lib/lrama/new_lexer.rb b/lib/lrama/new_lexer.rb
@@ -127,9 +127,12 @@ def lex_c_code
  code += @scanner.matched
  newline
  when @scanner.scan(/"/)
- matched = @scanner.scan_until(/"/)[0..-2]
- code += %Q("#{matched}")
+ matched = @scanner.scan_until(/"/)
+ code += %Q("#{matched})
  @line += matched.count("\n")
+ when @scanner.scan(/'/)
+ matched = @scanner.scan_until(/'/)
+ code += %Q('#{matched})
  else
  code += @scanner.getch
  end

diff --git a/spec/lrama/new_parser_spec.rb b/spec/lrama/new_parser_spec.rb
@@ -797,7 +797,7 @@ class : keyword_class { code 4 } tSTRING '?' keyword_end %prec tEQ { code 5 } {
  end
 
  describe "\" in user code" do
- xit do
+ it do
  y = header + <<~INPUT
 %%
 
@@ -818,13 +818,13 @@ class : keyword_class
  expect(codes[0].s_value).to eq(<<-STR.chomp)
 
  func("}");
-
+ 
  STR
  end
  end
 
  describe "' in user code" do
- xit do
+ it do
  y = header + <<~INPUT
 %%
 
@@ -845,7 +845,7 @@ class : keyword_class
  expect(codes[0].s_value).to eq(<<-STR.chomp)
 
  func('}');
-
+ 
  STR
  end
  end