fix: handling of of keyword (#174)

guybedford · May 17, 2024 · 4c1fac8 · 4c1fac8
1 parent c3a60c3
commit 4c1fac8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 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.c b/src/lexer.c
@@ -189,6 +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) ||
               lastToken == '}' && (isExpressionTerminator(openTokenStack[openTokenDepth].pos) || openTokenStack[openTokenDepth].token == ClassBrace) ||
               isExpressionKeyword(lastTokenPos) ||
               lastToken == '/' && lastSlashWasDivision ||
@@ -871,7 +872,7 @@ bool readPrecedingKeywordn (char16_t* pos, const char16_t* compare, size_t n) {
 }
 
 // Detects one of case, debugger, delete, do, else, in, instanceof, new,
-//   return, throw, typeof, void, yield ,await, of
+//   return, throw, typeof, void, yield ,await
 bool isExpressionKeyword (char16_t* pos) {
   switch (*pos) {
     case 'd':
@@ -908,12 +909,7 @@ bool isExpressionKeyword (char16_t* pos) {
           return false;
       }
     case 'f':
-      if (*(pos - 1) != 'o')
-        return false;
-      // of
-      if (pos -2 == source || isBrOrWsOrPunctuatorNotDot(*(pos - 2)))
-        return true;
-      if (*(pos - 2) != 'e')
+      if (*(pos - 1) != 'o' || *(pos - 2) != 'e')
         return false;
       switch (*(pos - 3)) {
         case 'c':

diff --git a/test/_unit.cjs b/test/_unit.cjs
@@ -39,6 +39,15 @@ function assertExportIs(source, actual, expected) {
 suite('Lexer', () => {
   beforeEach(async () => await init);
 
+  test(`Regex case`, () => {
+    const source = `for(let t of/[0-9]+/g.exec(e)){}`
+    parse(source);
+  });
+
+  test('keyword case', () => {
+    parse('const of=1;console.log(1+of/1)');
+  });
+
   test('import types', () => {
     const input = `
       // dynamic
@@ -61,11 +70,6 @@ suite('Lexer', () => {
     assert.strictEqual(imports[5].t, 3);
   });
 
-  test(`Regex case`, () => {
-    const source = `for(let t of/[0-9]+/g.exec(e)){}`
-    parse(source);
-  });
-
   test(`Source phase imports`, () => {
     const source = `
       import source