Allow redeclare variables defined with var

imteekay · Jun 3, 2023 · 03e83b2 · 03e83b2
1 parent 7657d8d
commit 03e83b2
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 10 deletions.
diff --git a/baselines/reference/redeclare.errors.baseline b/baselines/reference/redeclare.errors.baseline
@@ -1,6 +1 @@
-[
-  {
-    "pos": 14,
-    "message": "Cannot redeclare x; first declared at 3"
-  }
-]
+[]
diff --git a/baselines/reference/redeclare.tree.baseline b/baselines/reference/redeclare.tree.baseline
@@ -4,6 +4,10 @@
       {
         "kind": "Var",
         "pos": 3
+      },
+      {
+        "kind": "Var",
+        "pos": 14
       }
     ]
   },

diff --git a/src/bind.ts b/src/bind.ts
@@ -1,4 +1,4 @@
-import { Module, Node, Statement, Table } from './types';
+import { Declaration, Module, Node, Statement, Table } from './types';
 import { error } from './error';
 
 export function bind(m: Module) {
@@ -16,9 +16,9 @@ export function bind(m: Module) {
       if (symbol) {
         const other = symbol.declarations.find(
           (d) =>
-            d.kind === statement.kind ||
-            (d.kind === Node.Var && statement.kind === Node.Let) ||
-            (d.kind === Node.Let && statement.kind === Node.Var),
+            hasEqualKindButNotVar(d, statement) ||
+            willRedeclareVarWithLet(d, statement) ||
+            willRedeclareLetWithVar(d, statement),
         );
         if (other) {
           error(
@@ -41,6 +41,27 @@ export function bind(m: Module) {
       }
     }
   }
+
+  function hasEqualKindButNotVar(
+    declaration: Declaration,
+    statement: Statement,
+  ) {
+    return declaration.kind === statement.kind && statement.kind !== Node.Var;
+  }
+
+  function willRedeclareVarWithLet(
+    declaration: Declaration,
+    statement: Statement,
+  ) {
+    return declaration.kind === Node.Var && statement.kind === Node.Let;
+  }
+
+  function willRedeclareLetWithVar(
+    declaration: Declaration,
+    statement: Statement,
+  ) {
+    return declaration.kind === Node.Let && statement.kind === Node.Var;
+  }
 }
 
 export function resolve(