feat: prevent variable declaration from shadowing functions

src/types/__snapshots__/resolveStatements.spec.ts.snap

@@ -1063,11 +1063,11 @@ exports[`resolveStatements should resolve statements for case-11 1`] = `
     "Int",
   ],
   [
-    "toString",
+    "number",
     "Int",
   ],
   [
-    "dump(toString)",
+    "dump(number)",
     "<void>",
   ],
 ]

src/types/resolveDescriptors.ts

@@ -25,6 +25,7 @@ import {
     TypeOrigin,
     TypeRef,
     typeRefEquals,
+    VariableDescription,
 } from "./types";
 import { getRawAST } from "../grammar/store";
 import { cloneNode } from "../grammar/clone";
@@ -39,6 +40,7 @@ import { GlobalFunctions } from "../abi/global";
 const store = createContextStore<TypeDescription>();
 const staticFunctionsStore = createContextStore<FunctionDescription>();
 const staticConstantsStore = createContextStore<ConstantDescription>();
+const variablesStore = createContextStore<VariableDescription>();
 
 function verifyMapType(
     key: string,
@@ -1568,12 +1570,15 @@ export function resolveDescriptors(ctx: CompilerContext) {
 
     for (const [k, t] of types) {
         ctx = store.set(ctx, k, t);
+        //ctx = variablesStore.set(ctx, k, t);
     }
     for (const [k, t] of staticFunctions) {
         ctx = staticFunctionsStore.set(ctx, k, t);
+        ctx = variablesStore.set(ctx, k, t);
     }
     for (const [k, t] of staticConstants) {
         ctx = staticConstantsStore.set(ctx, k, t);
+        ctx = variablesStore.set(ctx, k, t);
     }
 
     return ctx;
@@ -1612,6 +1617,21 @@ export function hasStaticFunction(ctx: CompilerContext, name: string) {
     return !!staticFunctionsStore.get(ctx, name);
 }
 
+export function getVariable(
+    ctx: CompilerContext,
+    name: string,
+): VariableDescription {
+    const r = variablesStore.get(ctx, name);
+    if (!r) {
+        throw Error("Variable " + name + " not found");
+    }
+    return r;
+}
+
+export function hasVariable(ctx: CompilerContext, name: string) {
+    return !!variablesStore.get(ctx, name);
+}
+
 export function getStaticConstant(
     ctx: CompilerContext,
     name: string,

src/types/resolveStatements.ts

@@ -4,6 +4,7 @@ import { isAssignable } from "./isAssignable";
 import {
     getAllStaticFunctions,
     getAllTypes,
+    hasVariable,
     resolveTypeRef,
 } from "./resolveDescriptors";
 import {
@@ -180,6 +181,9 @@ function processStatements(
                 );
             }
 
+            if (hasVariable(ctx, s.name)) {
+                throwError(`Variable already defined : ${s.name}`, s.ref);
+            }
             // Add variable to statement context
             if (sctx.vars.has(s.name)) {
                 throwError(`Variable "${s.name}" already exists`, s.ref);

src/types/stmts-failed/case-53.tact

@@ -0,0 +1,6 @@
+primitive Int;
+
+fun rec(): Int {
+    let rec: Int = 42;  // shadowing error
+    return rec;
+}

src/types/stmts/case-11.tact

@@ -1,6 +1,6 @@
 primitive Int;
 
 fun testFunction() {
-    let toString: Int = 1;
-    dump(toString);
+    let number: Int = 1;
+    dump(number);
 }

src/types/types.ts

@@ -76,6 +76,10 @@ export type ConstantDescription = {
     ast: ASTConstant;
 };
 
+export type VariableDescription = {
+    name: string;
+};
+
 export type FunctionArgument = {
     name: string;
     type: TypeRef;