fixed parsing of nested for loops

Walperr · Nov 22, 2023 · c72b0b3 · c72b0b3
1 parent c8f0b6c
commit c72b0b3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/LanguageParser/Parser/PreParser.cs b/LanguageParser/Parser/PreParser.cs
@@ -7,7 +7,7 @@ internal sealed class PreParser
 {
     private readonly TokenStream _tokenStream;
     private SyntaxException? _error;
-    private int? _targetPlacement;
+    private readonly Stack<int> _targetPlacement = new();
 
     public PreParser(TokenStream tokenStream)
     {
@@ -48,21 +48,23 @@ private IEnumerable<Token> GetTokensWithBraces()
                 yield return new Token(SyntaxKind.OpenBrace, "", stream.Current.Range.Start);
 
                 var index = stream.Index;
-                
-                _targetPlacement = parser.ParseExpression()?.Range.End;
+
+                var target = parser.ParseExpression()?.Range.End;
 
                 while (stream.Index > index) 
                     stream.Recede();
 
-                if (_targetPlacement is null)
+                if (target is null)
                     _error = parser.Error;
+                else
+                    _targetPlacement.Push(target.Value);
             }
 
             yield return stream.Current;
-            
-            if (_targetPlacement == stream.Current.Range.End)
-                yield return new Token(SyntaxKind.CloseBrace, "", _targetPlacement.Value);
-            
+
+            if (_targetPlacement.TryPeek(out var currentTarget) && currentTarget == stream.Current.Range.End)
+                yield return new Token(SyntaxKind.CloseBrace, "", _targetPlacement.Pop());
+
             stream.Advance();
         }
 

diff --git a/SimpleExecutor/ViewModels/MainViewModel.cs b/SimpleExecutor/ViewModels/MainViewModel.cs
@@ -176,4 +176,19 @@ public string Output
 //         setColor("blue")
 //     else
 //         setColor("green")
+// }
+
+// setColor('transparent')
+// jump(350,310)
+//
+// setColor('blue')
+//
+// for (number size =6; size <= 146; size = size + 20)
+// {
+//     for (number i = 1; i < 4; i = i + 1)
+//     {
+//         move(size)
+//         rotate(90)
+//         size = size + 5
+//     }
 // }