fix: of keyword context in for statement only (#178)

guybedford · Jun 24, 2024 · 2f48134 · 2f48134
1 parent fc43bd7
commit 2f48134
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/lib/lexer.asm.js b/lib/lexer.asm.js
diff --git a/lib/lexer.emcc.asm.js b/lib/lexer.emcc.asm.js
diff --git a/lib/lexer.wasm b/lib/lexer.wasm
diff --git a/src/lexer.asm.js b/src/lexer.asm.js
@@ -13,7 +13,8 @@ const copy = new Uint8Array(new Uint16Array([1]).buffer)[0] === 1 ? function (sr
     outBuf16[i++] = (ch & 0xff) << 8 | ch >>> 8;
   }
 };
-const words = 'xportmportlassetaourceromsyncunctionssertvoyiedelecontininstantybreareturdebuggeawaithrwhileforifcatcfinallels';
+
+const words = 'xportmportlassforetaourceromsyncunctionssertvoyiedelecontininstantybreareturdebuggeawaithrwhileifcatcfinallels';
 
 let source, name;
 export function parse (_source, _name = '@') {

diff --git a/src/lexer.c b/src/lexer.c
@@ -189,7 +189,7 @@ bool parse () {
               !(lastToken == '.' && (*(lastTokenPos - 1) >= '0' && *(lastTokenPos - 1) <= '9')) &&
               !(lastToken == '+' && *(lastTokenPos - 1) == '+') && !(lastToken == '-' && *(lastTokenPos - 1) == '-') ||
               lastToken == ')' && isParenKeyword(openTokenStack[openTokenDepth].pos) ||
-              openTokenDepth > 0 && openTokenStack[openTokenDepth - 1].token == AnyParen && *(lastTokenPos) == 'f' && *(lastTokenPos - 1) == 'o' && isParenKeyword(openTokenStack[openTokenDepth - 1].pos) ||
+              openTokenDepth > 0 && openTokenStack[openTokenDepth - 1].token == AnyParen && *(lastTokenPos) == 'f' && *(lastTokenPos - 1) == 'o' && readPrecedingKeywordn(openTokenStack[openTokenDepth - 1].pos, &FOR[0], 3) ||
               lastToken == '}' && (isExpressionTerminator(openTokenStack[openTokenDepth].pos) || openTokenStack[openTokenDepth].token == ClassBrace) ||
               isExpressionKeyword(lastTokenPos) ||
               lastToken == '/' && lastSlashWasDivision ||

diff --git a/test/_unit.cjs b/test/_unit.cjs
@@ -38,6 +38,10 @@ function assertExportIs(source, actual, expected) {
 
 suite('Lexer', () => {
   beforeEach(async () => await init);
+
+  test('keyword case again', () => {
+    parse('if (of / 2) {}');
+  });
 
   test(`Regex case`, () => {
     const source = `for(let t of/[0-9]+/g.exec(e)){}`