Prevent multiple assignments in the same function

source-academy · Mar 18, 2024 · c8f4986 · c8f4986
1 parent 20932b9
commit c8f4986
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 10 deletions.
diff --git a/src/ast-types.ts b/src/ast-types.ts
diff --git a/src/parser.ts b/src/parser.ts
@@ -141,9 +141,9 @@ export class Parser {
         const startToken = this.peek();
         const statements: Stmt[] = [];
         while (!this.isAtEnd()) {
-            if (this.match(TokenType.NEWLINE)) {
-                continue;
-            }
+            // if (this.match(TokenType.NEWLINE)) {
+            //     continue;
+            // }
             statements.push(this.stmt());
         }
         const endToken = this.peek();
@@ -154,7 +154,7 @@ export class Parser {
         if (this.check(TokenType.DEF, TokenType.FOR, TokenType.IF, TokenType.WHILE)) {
             return this.compound_stmt();
         } else if (this.check(TokenType.NAME, ...PSEUD_NAMES, TokenType.NUMBER,
-            TokenType.PASS, TokenType.BREAK, TokenType.CONTINUE, TokenType.MINUS, TokenType.PLUS,
+            TokenType.PASS, TokenType.BREAK, TokenType.CONTINUE, TokenType.MINUS, TokenType.PLUS, TokenType.INDENT, TokenType.DEDENT,
             TokenType.RETURN, TokenType.FROM, TokenType.GLOBAL, TokenType.NONLOCAL,
             TokenType.ASSERT, TokenType.LPAR, TokenType.STRING, TokenType.BIGINT, ...SPECIAL_IDENTIFIER_TOKENS)) {
             return this.simple_stmt();
@@ -239,6 +239,10 @@ export class Parser {
         let res = null;
         if (this.match(TokenType.NAME)) {
             res = this.assign_stmt();
+        } else if (this.match(TokenType.INDENT)) {
+            res = new StmtNS.Indent(startToken, startToken);
+        } else if (this.match(TokenType.DEDENT)) {
+            res = new StmtNS.Dedent(startToken, startToken);
         } else if (this.match(TokenType.PASS)) {
             res = new StmtNS.Pass(startToken, startToken);
         } else if (this.match(TokenType.BREAK)) {

diff --git a/src/resolver.ts b/src/resolver.ts
@@ -125,6 +125,7 @@ class Environment {
 export class Resolver implements StmtNS.Visitor<void>, ExprNS.Visitor<void> {
     source: string;
     ast: Stmt;
+    // change the environment to be suite scope as in python
     environment: Environment | null;
     constructor(source: string, ast: Stmt) {
         this.source = source;
@@ -173,21 +174,40 @@ export class Resolver implements StmtNS.Visitor<void>, ExprNS.Visitor<void> {
         this.environment = oldEnv;
     }
 
+    visitIndentCreation(stmt: StmtNS.Indent): void {
+        // Create a new environment.
+        const oldEnv = this.environment;
+        this.environment = new Environment(this.source, this.environment, new Map());
+    }
+
+    visitDedentCreation(stmt: StmtNS.Dedent): void {
+        // Switch to the previous environment.
+        if (this.environment?.enclosing !== undefined) {
+            this.environment = this.environment.enclosing;
+        }
+    }
+
     visitFunctionDefStmt(stmt: StmtNS.FunctionDef) {
         this.environment?.declareName(stmt.name);
         this.environment?.functions.add(stmt.name.lexeme);
-        // Create a new environment.
-        const oldEnv = this.environment;
-        // Assign the parameters to the new environment.
-        const newEnv = new Map(
+        // // Create a new environment.
+        // const oldEnv = this.environment;
+        // // Assign the parameters to the new environment.
+        // const newEnv = new Map(
+        //     stmt.parameters.map(param => [param.lexeme, param])
+        // );
+        // this.environment = new Environment(this.source, this.environment, newEnv);
+        const params = new Map(
             stmt.parameters.map(param => [param.lexeme, param])
         );
-        this.environment = new Environment(this.source, this.environment, newEnv);
+        if (this.environment !== null) {
+            this.environment.names = params;
+        }
         this.resolve(stmt.body);
         // Grab identifiers from that new environment. That are NOT functions.
         // stmt.varDecls = this.varDeclNames(this.environment.names)
         // Restore old environment
-        this.environment = oldEnv;
+        // this.environment = oldEnv;
     }
 
     visitAnnAssignStmt(stmt: StmtNS.AnnAssign): void {