Fix scope check for 2nd+ lexical bindings

Fixes acornjs#803
jonyafek · Feb 5, 2019 · c4fdd0f · c4fdd0f
1 parent 600e770
commit c4fdd0f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/acorn/src/scope.js b/acorn/src/scope.js
@@ -53,7 +53,7 @@ pp.declareName = function(name, bindingType, pos) {
   } else {
     for (let i = this.scopeStack.length - 1; i >= 0; --i) {
       const scope = this.scopeStack[i]
-      if (scope.lexical.indexOf(name) > -1 && !(scope.flags & SCOPE_SIMPLE_CATCH) && scope.lexical[0] === name ||
+      if (scope.lexical.indexOf(name) > -1 && !((scope.flags & SCOPE_SIMPLE_CATCH) && scope.lexical[0] === name) ||
           !this.treatFunctionsAsVarInScope(scope) && scope.functions.indexOf(name) > -1) {
         redeclared = true
         break

diff --git a/test/tests-harmony.js b/test/tests-harmony.js
@@ -16226,8 +16226,16 @@ testFail("var foo = 1; let foo = 1;", "Identifier 'foo' has already been declare
 
 testFail("{ var foo = 1; let foo = 1; }", "Identifier 'foo' has already been declared (1:19)", {ecmaVersion: 6})
 
+testFail("let bar; var foo = 1; let foo = 1;", "Identifier 'foo' has already been declared (1:26)", {ecmaVersion: 6})
+
+testFail("{ let bar; var foo = 1; let foo = 1; }", "Identifier 'foo' has already been declared (1:28)", {ecmaVersion: 6})
+
 testFail("let foo = 1; var foo = 1;", "Identifier 'foo' has already been declared (1:17)", {ecmaVersion: 6})
 
+testFail("let bar; let foo = 1; var foo = 1;", "Identifier 'foo' has already been declared (1:26)", {ecmaVersion: 6})
+
+testFail("{ let bar; let foo = 1; var foo = 1; }", "Identifier 'foo' has already been declared (1:28)", {ecmaVersion: 6})
+
 testFail("let foo = 1; let foo = 1;", "Identifier 'foo' has already been declared (1:17)", {ecmaVersion: 6})
 
 testFail("var foo = 1; const foo = 1;", "Identifier 'foo' has already been declared (1:19)", {ecmaVersion: 6})