Merge pull request #88 from makenowjust/lex-at

Fix lexing `@10` in user codes correctly
ruby · Aug 22, 2023 · 47b3912 · 47b3912
2 parents a201d21 + 87ab5c3
commit 47b3912
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/lib/lrama/lexer.rb b/lib/lrama/lexer.rb
@@ -223,7 +223,7 @@ def lex_user_code(ss, line, column, lines)
  references << [:dollar, ss[2], tag, str.length, str.length + ss[0].length - 1]
  when ss.scan(/@\$/) # @$
  references << [:at, "$", nil, str.length, str.length + ss[0].length - 1]
- when ss.scan(/@(\d)+/) # @1
+ when ss.scan(/@(\d+)/) # @1
  references << [:at, Integer(ss[1]), nil, str.length, str.length + ss[0].length - 1]
  when ss.scan(/{/)
  brace_count += 1

diff --git a/spec/lrama/lexer_spec.rb b/spec/lrama/lexer_spec.rb
@@ -336,7 +336,8 @@ class : keyword_class tSTRING keyword_end %prec tPLUS
  tARGS
  { 5; }
  tBODY
- { $2; $3; $5; $7; $$ = 1; }
+ { $2; $3; $5; $7; $10; $$ = 1;
+ @2; @3; @5; @7; @10; @$ = 1; }
  ;
 %%
  INPUT
@@ -362,7 +363,14 @@ class : keyword_class tSTRING keyword_end %prec tPLUS
  [:dollar, 3, nil, 6, 7],
  [:dollar, 5, nil, 10, 11],
  [:dollar, 7, nil, 14, 15],
- [:dollar, "$", nil, 18, 19]
+ [:dollar, 10, nil, 18, 20],
+ [:dollar, "$", nil, 23, 24],
+ [:at, 2, nil, 43, 44],
+ [:at, 3, nil, 47, 48],
+ [:at, 5, nil, 51, 52],
+ [:at, 7, nil, 55, 56],
+ [:at, 10, nil, 59, 61],
+ [:at, "$", nil, 64, 65],
  ],
  ])
  end