For loops now can use existing variables

phantasma-io-archive · Sep 21, 2023 · 7b6855b · 7b6855b
1 parent 7956c01
commit 7b6855b
Showing 1 changed file with 26 additions and 6 deletions.
diff --git a/Library/src/Compilers/TombLangCompiler.cs b/Library/src/Compilers/TombLangCompiler.cs
@@ -1184,10 +1184,22 @@ private StatementBlock ParseCommandBlock(Scope scope, MethodDeclaration method)
 
                             ExpectToken("(");
 
-                            ExpectToken("local");
+                            bool mustExist;
+
+                            var next = FetchToken();
+                            if (next.value == "local")
+                            {
+                                mustExist = false;
+                            }
+                            else
+                            {
+                                mustExist = true;
+                                Rewind();
+                            }
 
                             AssignStatement initCmd;
-                            forCommand.loopVar = ParseVariableDeclaration(scope, out initCmd);
+                            forCommand.loopVar = ParseVariableDeclaration(scope, out initCmd, mustExist);
+
                             if (initCmd == null)
                             {
                                 throw new CompilerException("variable missing initialization statement in for loop");
@@ -1212,7 +1224,7 @@ private StatementBlock ParseCommandBlock(Scope scope, MethodDeclaration method)
                                 throw new CompilerException($"expected variable {varName} (temporary compiler limitation, no complex for statements supported!)");
                             }
 
-                            var next = FetchToken();
+                            next = FetchToken();
 
                             if (next.kind == TokenKind.Postfix)
                             {
@@ -1457,7 +1469,7 @@ private StatementBlock ParseCommandBlock(Scope scope, MethodDeclaration method)
             }
         }
 
-        private VarDeclaration ParseVariableDeclaration(Scope scope, out AssignStatement assignment)
+        private VarDeclaration ParseVariableDeclaration(Scope scope, out AssignStatement assignment, bool mustExist = false)
         {
             var varName = ExpectIdentifier();
 
@@ -1475,9 +1487,17 @@ private VarDeclaration ParseVariableDeclaration(Scope scope, out AssignStatement
 
             Expression initExpr = ParseVariableInitialization(scope, ref type);
 
-            var varDecl = new VarDeclaration(scope, varName, type, VarStorage.Local);
+            VarDeclaration varDecl;
 
-            scope.AddVariable(varDecl);
+            if (mustExist)
+            {
+                varDecl = scope.FindVariable(varName);
+            }
+            else
+            {
+                varDecl = new VarDeclaration(scope, varName, type, VarStorage.Local);
+                scope.AddVariable(varDecl);
+            }
 
             if (initExpr != null)
             {