for in syntax

compiler/NubLang/Generation/Generator.cs

@@ -95,7 +95,13 @@ public class Generator
 
             var name = FuncName(funcNode.Module, funcNode.Name, funcNode.Prototype.ExternSymbol);
             _writer.WriteLine($"{CType.Create(funcNode.Prototype.ReturnType, name)}({parameters})");
-            EmitBlock(funcNode.Body);
+            _writer.WriteLine("{");
+            using (_writer.Indent())
+            {
+                EmitBlock(funcNode.Body);
+            }
+
+            _writer.WriteLine("}");
             _writer.WriteLine();
         }
 
@@ -111,7 +117,13 @@ public class Generator
                 EmitAssignment(assignmentNode);
                 break;
             case BlockNode blockNode:
-                EmitBlock(blockNode);
+                _writer.WriteLine("{");
+                using (_writer.Indent())
+                {
+                    EmitBlock(blockNode);
+                }
+
+                _writer.WriteLine("{");
                 break;
             case BreakNode breakNode:
                 EmitBreak(breakNode);
@@ -122,6 +134,12 @@ public class Generator
             case DeferNode deferNode:
                 EmitDefer(deferNode);
                 break;
+            case ForConstArrayNode forConstArrayNode:
+                EmitForConstArray(forConstArrayNode);
+                break;
+            case ForSliceNode forSliceNode:
+                EmitForSlice(forSliceNode);
+                break;
             case IfNode ifNode:
                 EmitIf(ifNode);
                 break;
@@ -174,18 +192,64 @@ public class Generator
         _deferStack.Peek().Add(deferNode);
     }
 
+    private void EmitForSlice(ForSliceNode forSliceNode)
+    {
+        var targetType = (NubSliceType)forSliceNode.Target.Type;
+        var target = EmitExpression(forSliceNode.Target);
+        var indexName = forSliceNode.IndexName ?? NewTmp();
+
+        _writer.WriteLine($"for (size_t {indexName} = 0; {indexName} < {target}.length; ++{indexName})");
+        _writer.WriteLine("{");
+        using (_writer.Indent())
+        {
+            _writer.WriteLine($"{CType.Create(targetType.ElementType, forSliceNode.ElementName)} = {target}.data[{indexName}];");
+            EmitBlock(forSliceNode.Body);
+        }
+
+        _writer.WriteLine("}");
+    }
+
+    private void EmitForConstArray(ForConstArrayNode forConstArrayNode)
+    {
+        var targetType = (NubConstArrayType)forConstArrayNode.Target.Type;
+        var target = EmitExpression(forConstArrayNode.Target);
+        var indexName = forConstArrayNode.IndexName ?? NewTmp();
+
+        _writer.WriteLine($"for (size_t {indexName} = 0; {indexName} < {targetType.Size}; ++{indexName})");
+        _writer.WriteLine("{");
+        using (_writer.Indent())
+        {
+            _writer.WriteLine($"{CType.Create(targetType.ElementType, forConstArrayNode.ElementName)} = {target}[{indexName}];");
+            EmitBlock(forConstArrayNode.Body);
+        }
+
+        _writer.WriteLine("}");
+    }
+
     private void EmitIf(IfNode ifNode, bool elseIf = false)
     {
         var condition = EmitExpression(ifNode.Condition);
         _writer.WriteLine($"{(elseIf ? "else " : "")}if ({condition})");
-        EmitBlock(ifNode.Body);
+        _writer.WriteLine("{");
+        using (_writer.Indent())
+        {
+            EmitBlock(ifNode.Body);
+        }
+
+        _writer.WriteLine("}");
         ifNode.Else?.Match
         (
             elseIfNode => EmitIf(elseIfNode, true),
             elseNode =>
             {
                 _writer.WriteLine("else");
-                EmitBlock(elseNode);
+                _writer.WriteLine("{");
+                using (_writer.Indent())
+                {
+                    EmitBlock(elseNode);
+                }
+
+                _writer.WriteLine("}");
             }
         );
     }
@@ -251,7 +315,13 @@ public class Generator
     {
         var condition = EmitExpression(whileNode.Condition);
         _writer.WriteLine($"while ({condition})");
-        EmitBlock(whileNode.Body);
+        _writer.WriteLine("{");
+        using (_writer.Indent())
+        {
+            EmitBlock(whileNode.Body);
+        }
+
+        _writer.WriteLine("}");
     }
 
     private string EmitExpression(ExpressionNode expressionNode)
@@ -530,25 +600,17 @@ public class Generator
 
     private void EmitBlock(BlockNode blockNode)
     {
-        EmitLine(blockNode.Tokens.FirstOrDefault());
-        _writer.WriteLine("{");
-        using (_writer.Indent())
+        _deferStack.Push([]);
+
+        foreach (var statementNode in blockNode.Statements)
         {
-            _deferStack.Push([]);
-
-            foreach (var statementNode in blockNode.Statements)
-            {
-                EmitStatement(statementNode);
-            }
-
-            var blockDefers = _deferStack.Pop();
-            for (var i = blockDefers.Count - 1; i >= 0; i--)
-            {
-                EmitStatement(blockDefers[i].Statement);
-            }
+            EmitStatement(statementNode);
         }
 
-        EmitLine(blockNode.Tokens.LastOrDefault());
-        _writer.WriteLine("}");
+        var blockDefers = _deferStack.Pop();
+        for (var i = blockDefers.Count - 1; i >= 0; i--)
+        {
+            EmitStatement(blockDefers[i].Statement);
+        }
     }
 }