Add generic unt/uint

TODO.txt

@@ -0,0 +1,3 @@
+string formatting
+Dynamic arrays
+C-style arrays

compiler/ModuleGraph.cs

@@ -85,21 +85,21 @@ public class ModuleGraph
                         switch (type)
                         {
                             case Manifest.Module.TypeInfoStruct s:
-                            {
+                                {
-                                var info = new Module.TypeInfoStruct(Module.DefinitionSource.Imported, s.Exported, s.Packed);
+                                    var info = new Module.TypeInfoStruct(Module.DefinitionSource.Imported, s.Exported, s.Packed);
-                                var fields = s.Fields.Select(x => new Module.TypeInfoStruct.Field(x.Name, x.Type)).ToList();
+                                    var fields = s.Fields.Select(x => new Module.TypeInfoStruct.Field(x.Name, x.Type)).ToList();
-                                info.SetFields(fields);
+                                    info.SetFields(fields);
-                                module.AddType(name, info);
+                                    module.AddType(name, info);
-                                break;
+                                    break;
-                            }
+                                }
                             case Manifest.Module.TypeInfoEnum e:
-                            {
+                                {
-                                var info = new Module.TypeInfoEnum(Module.DefinitionSource.Imported, e.Exported);
+                                    var info = new Module.TypeInfoEnum(Module.DefinitionSource.Imported, e.Exported);
-                                var variants = e.Variants.Select(v => new Module.TypeInfoEnum.Variant(v.Name, v.Type)).ToList();
+                                    var variants = e.Variants.Select(v => new Module.TypeInfoEnum.Variant(v.Name, v.Type)).ToList();
-                                info.SetVariants(variants);
+                                    info.SetVariants(variants);
-                                module.AddType(name, info);
+                                    module.AddType(name, info);
-                                break;
+                                    break;
-                            }
+                                }
                             default:
                                 throw new ArgumentOutOfRangeException(nameof(type));
                         }
@@ -150,7 +150,7 @@ public class ModuleGraph
 
                     if (typeInfo is Module.TypeInfoEnum enumType)
                     {
-                        var variants = enumDef.Variants.Select(v => new Module.TypeInfoEnum.Variant(v.Name.Ident, ResolveType(v.Type, module.Name))).ToList();
+                        var variants = enumDef.Variants.Select(v => new Module.TypeInfoEnum.Variant(v.Name.Ident, v.Type == null ? null : ResolveType(v.Type, module.Name))).ToList();
                         enumType.SetVariants(variants);
                     }
                 }
@@ -210,7 +210,9 @@ public class ModuleGraph
                     NodeTypeSInt type => NubTypeSInt.Get(type.Width),
                     NodeTypeUInt type => NubTypeUInt.Get(type.Width),
                     NodeTypeString => NubTypeString.Instance,
+                    NodeTypeChar => NubTypeChar.Instance,
                     NodeTypeVoid => NubTypeVoid.Instance,
+                    NodeTypeArray type => NubTypeArray.Get(ResolveType(type.ElementType, currentModule)),
                     _ => throw new ArgumentOutOfRangeException(nameof(node))
                 };
             }
@@ -435,10 +437,10 @@ public class Module(string name)
             this.variants = variants;
         }
 
-        public class Variant(string name, NubType type)
+        public class Variant(string name, NubType? type)
         {
             public string Name { get; } = name;
-            public NubType Type { get; } = type;
+            public NubType? Type { get; } = type;
         }
     }
 }

compiler/NubLib.cs

@@ -104,7 +104,7 @@ public record Manifest(Dictionary<string, Manifest.Module> Modules)
 
         public record TypeInfoEnum(bool Exported, IReadOnlyList<TypeInfoEnum.Variant> Variants) : TypeInfo(Exported)
         {
-            public record Variant(string Name, NubType Type);
+            public record Variant(string Name, NubType? Type);
         }
     }
 }

compiler/NubType.cs

@@ -102,6 +102,17 @@ public class NubTypeString : NubType
     public override string ToString() => "string";
 }
 
+public class NubTypeChar : NubType
+{
+    public static readonly NubTypeChar Instance = new();
+
+    private NubTypeChar()
+    {
+    }
+
+    public override string ToString() => "char";
+}
+
 public class NubTypeStruct : NubType
 {
     private static readonly Dictionary<(string Module, string Name), NubTypeStruct> Cache = new();
@@ -256,6 +267,28 @@ public class NubTypeFunc : NubType
     private record Signature(IReadOnlyList<NubType> Parameters, NubType ReturnType);
 }
 
+public class NubTypeArray : NubType
+{
+    private static readonly Dictionary<NubType, NubTypeArray> Cache = new();
+
+    public static NubTypeArray Get(NubType to)
+    {
+        if (!Cache.TryGetValue(to, out var ptr))
+            Cache[to] = ptr = new NubTypeArray(to);
+
+        return ptr;
+    }
+
+    public NubType ElementType { get; }
+
+    private NubTypeArray(NubType elementType)
+    {
+        ElementType = elementType;
+    }
+
+    public override string ToString() => $"[]{ElementType}";
+}
+
 public class TypeEncoder
 {
     public static string Encode(NubType type)
@@ -302,6 +335,10 @@ public class TypeEncoder
                 sb.Append('S');
                 break;
 
+            case NubTypeChar:
+                sb.Append('C');
+                break;
+
             case NubTypePointer p:
                 sb.Append("P(");
                 EncodeType(sb, p.To);
@@ -355,6 +392,12 @@ public class TypeEncoder
                 sb.Append(')');
                 break;
 
+            case NubTypeArray a:
+                sb.Append("A(");
+                EncodeType(sb, a.ElementType);
+                sb.Append(')');
+                break;
+
             default:
                 throw new NotSupportedException(type.GetType().Name);
         }
@@ -392,10 +435,12 @@ public class TypeDecoder
             'U' => DecodeUInt(),
             'I' => DecodeSInt(),
             'S' => NubTypeString.Instance,
+            'C' => NubTypeChar.Instance,
             'P' => DecodePointer(),
             'F' => DecodeFunc(),
             'T' => DecodeStruct(),
             'E' => DecodeEnum(),
+            'A' => DecodeArray(),
             _ => throw new Exception($"'{start}' is not a valid start to a type")
         };
     }
@@ -531,6 +576,14 @@ public class TypeDecoder
         throw new Exception($"Expected 'V' or 'N'");
     }
 
+    private NubTypeArray DecodeArray()
+    {
+        Expect('(');
+        var elementType = DecodeType();
+        Expect(')');
+        return NubTypeArray.Get(elementType);
+    }
+
     private bool TryPeek(out char c)
     {
         if (index >= encoded.Length)

compiler/Parser.cs

@@ -74,7 +74,7 @@ public class Parser
             }
         }
 
-        modifier_done:
+    modifier_done:
 
         if (TryExpectKeyword(Keyword.Func))
         {
@@ -86,17 +86,7 @@ public class Parser
                 throw BasicError("Invalid modifier for function", modifier.Value);
 
             var name = ExpectIdent();
-            var parameters = new List<NodeDefinitionFunc.Param>();
+            var parameters = ParseFuncParameters();
-
-            ExpectSymbol(Symbol.OpenParen);
-            while (!TryExpectSymbol(Symbol.CloseParen))
-            {
-                var paramStartIndex = index;
-                var parameterName = ExpectIdent();
-                ExpectSymbol(Symbol.Colon);
-                var parameterType = ParseType();
-                parameters.Add(new NodeDefinitionFunc.Param(TokensFrom(paramStartIndex), parameterName, parameterType));
-            }
 
             NodeType? returnType = null;
             if (TryExpectSymbol(Symbol.Colon))
@@ -132,6 +122,7 @@ public class Parser
                 var fieldName = ExpectIdent();
                 ExpectSymbol(Symbol.Colon);
                 var fieldType = ParseType();
+                TryExpectSymbol(Symbol.Comma);
                 fields.Add(new NodeDefinitionStruct.Field(TokensFrom(fieldStartIndex), fieldName, fieldType));
             }
 
@@ -154,8 +145,13 @@ public class Parser
             {
                 var variantsStartIndex = index;
                 var variantName = ExpectIdent();
-                ExpectSymbol(Symbol.Colon);
+
-                var variantType = ParseType();
+                NodeType? variantType = null;
+                if (TryExpectSymbol(Symbol.Colon))
+                    variantType = ParseType();
+
+                TryExpectSymbol(Symbol.Comma);
+
                 variants.Add(new NodeDefinitionEnum.Variant(TokensFrom(variantsStartIndex), variantName, variantType));
             }
 
@@ -180,6 +176,35 @@ public class Parser
         throw BasicError("Not a valid definition", Peek());
     }
 
+    private List<NodeDefinitionFunc.Param> ParseFuncParameters()
+    {
+        var parameters = new List<NodeDefinitionFunc.Param>();
+
+        ExpectSymbol(Symbol.OpenParen);
+
+        while (true)
+        {
+            if (TryExpectSymbol(Symbol.CloseParen))
+                break;
+
+            var startIndex = index;
+
+            var name = ExpectIdent();
+            ExpectSymbol(Symbol.Colon);
+            var type = ParseType();
+
+            parameters.Add(new NodeDefinitionFunc.Param(TokensFrom(startIndex), name, type));
+
+            if (!TryExpectSymbol(Symbol.Comma))
+            {
+                ExpectSymbol(Symbol.CloseParen);
+                break;
+            }
+        }
+
+        return parameters;
+    }
+
     private NodeStatement ParseStatement()
     {
         var startIndex = index;
@@ -195,7 +220,17 @@ public class Parser
 
         if (TryExpectKeyword(Keyword.Return))
         {
-            var value = ParseExpression();
+            NodeExpression? value = null;
+
+            if (Peek() is TokenIdent token && token.Ident == "void")
+            {
+                Next();
+            }
+            else
+            {
+                value = ParseExpression();
+            }
+
             return new NodeStatementReturn(TokensFrom(startIndex), value);
         }
 
@@ -228,8 +263,17 @@ public class Parser
         if (TryExpectKeyword(Keyword.While))
         {
             var condition = ParseExpression();
-            var thenBlock = ParseStatement();
+            var block = ParseStatement();
-            return new NodeStatementWhile(TokensFrom(startIndex), condition, thenBlock);
+            return new NodeStatementWhile(TokensFrom(startIndex), condition, block);
+        }
+
+        if (TryExpectKeyword(Keyword.For))
+        {
+            var variableName = ExpectIdent();
+            ExpectKeyword(Keyword.In);
+            var array = ParseExpression();
+            var block = ParseStatement();
+            return new NodeStatementFor(TokensFrom(startIndex), variableName, array, block);
         }
 
         if (TryExpectKeyword(Keyword.Match))
@@ -241,10 +285,10 @@ public class Parser
             while (!TryExpectSymbol(Symbol.CloseCurly))
             {
                 var caseStartIndex = index;
-                var type = ExpectIdent();
+                var variant = ExpectIdent();
-                var variableName = ExpectIdent();
+                TryExpectIdent(out var variableName);
                 var body = ParseStatement();
-                cases.Add(new NodeStatementMatch.Case(TokensFrom(caseStartIndex), type, variableName, body));
+                cases.Add(new NodeStatementMatch.Case(TokensFrom(caseStartIndex), variant, variableName, body));
             }
 
             return new NodeStatementMatch(TokensFrom(startIndex), target, cases);
@@ -328,6 +372,19 @@ public class Parser
             var target = ParseExpression();
             expr = new NodeExpressionUnary(TokensFrom(startIndex), target, NodeExpressionUnary.Op.Negate);
         }
+        else if (TryExpectSymbol(Symbol.OpenSquare))
+        {
+            var values = new List<NodeExpression>();
+
+            while (!TryExpectSymbol(Symbol.CloseSquare))
+            {
+                var value = ParseExpression();
+                values.Add(value);
+                TryExpectSymbol(Symbol.Comma);
+            }
+
+            expr = new NodeExpressionArrayLiteral(TokensFrom(startIndex), values);
+        }
         else if (TryExpectSymbol(Symbol.OpenCurly))
         {
             var initializers = new List<NodeExpressionStructLiteral.Initializer>();
@@ -370,30 +427,50 @@ public class Parser
 
             expr = new NodeExpressionIdent(TokensFrom(startIndex), sections);
         }
-        else if (TryExpectKeyword(Keyword.Struct))
+        else if (TryExpectKeyword(Keyword.New))
         {
             var type = ParseType();
 
-            var initializers = new List<NodeExpressionStructLiteral.Initializer>();
+            if (type is NodeTypeString)
-
-            ExpectSymbol(Symbol.OpenCurly);
-            while (!TryExpectSymbol(Symbol.CloseCurly))
             {
-                var initializerStartIndex = startIndex;
+                ExpectSymbol(Symbol.OpenParen);
-                var fieldName = ExpectIdent();
+                var value = ParseExpression();
-                ExpectSymbol(Symbol.Equal);
+                ExpectSymbol(Symbol.CloseParen);
-                var fieldValue = ParseExpression();
+
-                initializers.Add(new NodeExpressionStructLiteral.Initializer(TokensFrom(initializerStartIndex), fieldName, fieldValue));
+                expr = new NodeExpressionStringConstructor(TokensFrom(startIndex), value);
             }
+            else if (type is NodeTypeNamed namedType)
+            {
+                if (TryExpectSymbol(Symbol.OpenParen))
+                {
+                    var value = ParseExpression();
+                    ExpectSymbol(Symbol.CloseParen);
 
-            expr = new NodeExpressionStructLiteral(TokensFrom(startIndex), type, initializers);
+                    expr = new NodeExpressionEnumLiteral(TokensFrom(startIndex), namedType, value);
-        }
+                }
-        else if (TryExpectKeyword(Keyword.Enum))
+                else if (TryExpectSymbol(Symbol.OpenCurly))
-        {
+                {
-            var type = ParseType();
+                    var initializers = new List<NodeExpressionStructLiteral.Initializer>();
-            var value = ParseExpression();
+                    while (!TryExpectSymbol(Symbol.CloseCurly))
+                    {
+                        var initializerStartIndex = startIndex;
+                        var fieldName = ExpectIdent();
+                        ExpectSymbol(Symbol.Equal);
+                        var fieldValue = ParseExpression();
+                        initializers.Add(new NodeExpressionStructLiteral.Initializer(TokensFrom(initializerStartIndex), fieldName, fieldValue));
+                    }
 
-            expr = new NodeExpressionEnumLiteral(TokensFrom(startIndex), type, value);
+                    expr = new NodeExpressionStructLiteral(TokensFrom(startIndex), null, initializers);
+                }
+                else
+                {
+                    expr = new NodeExpressionEnumLiteral(TokensFrom(startIndex), namedType, null);
+                }
+            }
+            else
+            {
+                throw BasicError($"Expected named type or string", type);
+            }
         }
         else
         {
@@ -412,7 +489,10 @@ public class Parser
                 var parameters = new List<NodeExpression>();
 
                 while (!TryExpectSymbol(Symbol.CloseParen))
+                {
                     parameters.Add(ParseExpression());
+                    TryExpectSymbol(Symbol.Comma);
+                }
 
                 expr = new NodeExpressionFuncCall(TokensFrom(startIndex), expr, parameters);
             }
@@ -466,6 +546,13 @@ public class Parser
             return new NodeTypeAnonymousStruct(TokensFrom(startIndex), fields);
         }
 
+        if (TryExpectSymbol(Symbol.OpenSquare))
+        {
+            ExpectSymbol(Symbol.CloseSquare);
+            var elementType = ParseType();
+            return new NodeTypeArray(TokensFrom(startIndex), elementType);
+        }
+
         if (TryExpectIdent(out var ident))
         {
             switch (ident.Ident)
@@ -474,8 +561,12 @@ public class Parser
                     return new NodeTypeVoid(TokensFrom(startIndex));
                 case "string":
                     return new NodeTypeString(TokensFrom(startIndex));
+                case "char":
+                    return new NodeTypeChar(TokensFrom(startIndex));
                 case "bool":
                     return new NodeTypeBool(TokensFrom(startIndex));
+                case "int":
+                    return new NodeTypeSInt(TokensFrom(startIndex), 64);
                 case "i8":
                     return new NodeTypeSInt(TokensFrom(startIndex), 8);
                 case "i16":
@@ -484,6 +575,8 @@ public class Parser
                     return new NodeTypeSInt(TokensFrom(startIndex), 32);
                 case "i64":
                     return new NodeTypeSInt(TokensFrom(startIndex), 64);
+                case "uint":
+                    return new NodeTypeUInt(TokensFrom(startIndex), 64);
                 case "u8":
                     return new NodeTypeUInt(TokensFrom(startIndex), 8);
                 case "u16":
@@ -700,6 +793,11 @@ public class Parser
     {
         return new CompileException(Diagnostic.Error(message).At(fileName, ident).Build());
     }
+
+    private CompileException BasicError(string message, Node? node)
+    {
+        return new CompileException(Diagnostic.Error(message).At(fileName, node).Build());
+    }
 }
 
 public class Ast(string fileName, TokenIdent moduleName, List<NodeDefinition> definitions)
@@ -759,10 +857,10 @@ public class NodeDefinitionEnum(List<Token> tokens, bool exported, TokenIdent na
     public TokenIdent Name { get; } = name;
     public List<Variant> Variants { get; } = variants;
 
-    public class Variant(List<Token> tokens, TokenIdent name, NodeType type) : Node(tokens)
+    public class Variant(List<Token> tokens, TokenIdent name, NodeType? type) : Node(tokens)
     {
         public TokenIdent Name { get; } = name;
-        public NodeType Type { get; } = type;
+        public NodeType? Type { get; } = type;
     }
 }
 
@@ -792,9 +890,9 @@ public class NodeStatementExpression(List<Token> tokens, NodeExpression expressi
     public NodeExpression Expression { get; } = expression;
 }
 
-public class NodeStatementReturn(List<Token> tokens, NodeExpression value) : NodeStatement(tokens)
+public class NodeStatementReturn(List<Token> tokens, NodeExpression? value) : NodeStatement(tokens)
 {
-    public NodeExpression Value { get; } = value;
+    public NodeExpression? Value { get; } = value;
 }
 
 public class NodeStatementVariableDeclaration(List<Token> tokens, TokenIdent name, NodeType? type, NodeExpression value) : NodeStatement(tokens)
@@ -823,15 +921,22 @@ public class NodeStatementWhile(List<Token> tokens, NodeExpression condition, No
     public NodeStatement Body { get; } = body;
 }
 
+public class NodeStatementFor(List<Token> tokens, TokenIdent variableName, NodeExpression array, NodeStatement body) : NodeStatement(tokens)
+{
+    public TokenIdent VariableName { get; } = variableName;
+    public NodeExpression Array { get; } = array;
+    public NodeStatement Body { get; } = body;
+}
+
 public class NodeStatementMatch(List<Token> tokens, NodeExpression target, List<NodeStatementMatch.Case> cases) : NodeStatement(tokens)
 {
     public NodeExpression Target { get; } = target;
     public List<Case> Cases { get; } = cases;
 
-    public class Case(List<Token> tokens, TokenIdent type, TokenIdent variableName, NodeStatement body) : Node(tokens)
+    public class Case(List<Token> tokens, TokenIdent type, TokenIdent? variableName, NodeStatement body) : Node(tokens)
     {
         public TokenIdent Variant { get; } = type;
-        public TokenIdent VariableName { get; } = variableName;
+        public TokenIdent? VariableName { get; } = variableName;
         public NodeStatement Body { get; } = body;
     }
 }
@@ -853,9 +958,9 @@ public class NodeExpressionBoolLiteral(List<Token> tokens, TokenBoolLiteral valu
     public TokenBoolLiteral Value { get; } = value;
 }
 
-public class NodeExpressionStructLiteral(List<Token> tokens, NodeType? type, List<NodeExpressionStructLiteral.Initializer> initializers) : NodeExpression(tokens)
+public class NodeExpressionStructLiteral(List<Token> tokens, NodeTypeNamed? type, List<NodeExpressionStructLiteral.Initializer> initializers) : NodeExpression(tokens)
 {
-    public NodeType? Type { get; } = type;
+    public NodeTypeNamed? Type { get; } = type;
     public List<Initializer> Initializers { get; } = initializers;
 
     public class Initializer(List<Token> tokens, TokenIdent name, NodeExpression value) : Node(tokens)
@@ -865,9 +970,19 @@ public class NodeExpressionStructLiteral(List<Token> tokens, NodeType? type, Lis
     }
 }
 
-public class NodeExpressionEnumLiteral(List<Token> tokens, NodeType type, NodeExpression value) : NodeExpression(tokens)
+public class NodeExpressionEnumLiteral(List<Token> tokens, NodeTypeNamed type, NodeExpression? value) : NodeExpression(tokens)
+{
+    public NodeTypeNamed Type { get; } = type;
+    public NodeExpression? Value { get; } = value;
+}
+
+public class NodeExpressionArrayLiteral(List<Token> tokens, List<NodeExpression> values) : NodeExpression(tokens)
+{
+    public List<NodeExpression> Values { get; } = values;
+}
+
+public class NodeExpressionStringConstructor(List<Token> tokens, NodeExpression value) : NodeExpression(tokens)
 {
-    public NodeType Type { get; } = type;
     public NodeExpression Value { get; } = value;
 }
 
@@ -951,6 +1066,8 @@ public class NodeTypeBool(List<Token> tokens) : NodeType(tokens);
 
 public class NodeTypeString(List<Token> tokens) : NodeType(tokens);
 
+public class NodeTypeChar(List<Token> tokens) : NodeType(tokens);
+
 public class NodeTypeNamed(List<Token> tokens, List<TokenIdent> sections) : NodeType(tokens)
 {
     public List<TokenIdent> Sections { get; } = sections;
@@ -967,6 +1084,11 @@ public class NodeTypeAnonymousStruct(List<Token> tokens, List<NodeTypeAnonymousS
     }
 }
 
+public class NodeTypeArray(List<Token> tokens, NodeType elementType) : NodeType(tokens)
+{
+    public NodeType ElementType { get; } = elementType;
+}
+
 public class NodeTypePointer(List<Token> tokens, NodeType to) : NodeType(tokens)
 {
     public NodeType To { get; } = to;

compiler/Program.cs

@@ -128,18 +128,36 @@ else
     Directory.CreateDirectory(".build");
 }
 
-var output = Generator.Emit(functions, moduleGraph, compileLib);
+string? entryPoint = null;
-File.WriteAllText(".build/out.c", output);
+
+if (!compileLib)
+{
+    if (!moduleGraph.TryResolveIdentifier("main", "main", true, out var info) || info.Type is not NubTypeFunc entryPointType)
+    {
+        DiagnosticFormatter.Print(Diagnostic.Error("func main::main(): i32 is not defined. If you wanted to compile as a library, specify --type=lib").Build(), Console.Error);
+        return 1;
+    }
+
+    if (!entryPointType.ReturnType.IsAssignableTo(NubTypeSInt.Get(32)))
+    {
+        DiagnosticFormatter.Print(Diagnostic.Error($"Entrypoint must return an i32 (currently '{entryPointType.ReturnType}')").Build(), Console.Error);
+        return 1;
+    }
+
+    entryPoint = info.MangledName;
+}
+
+var outFile = Generator.Emit(functions, moduleGraph, entryPoint);
 
 if (compileLib)
 {
-    Process.Start("gcc", ["-Og", "-fno-builtin", "-c", "-o", ".build/out.o", ".build/out.c", .. archivePaths]).WaitForExit();
+    Process.Start("gcc", ["-Og", "-g", "-Wall", "-Werror", "-c", "-o", ".build/out.o", outFile, .. archivePaths]).WaitForExit();
     Process.Start("ar", ["rcs", ".build/out.a", ".build/out.o"]).WaitForExit();
     NubLib.Pack(".build/out.nublib", ".build/out.a", Manifest.Create(moduleGraph));
 }
 else
 {
-    Process.Start("gcc", ["-Og", "-fno-builtin", "-o", ".build/out", ".build/out.c", .. archivePaths]).WaitForExit();
+    Process.Start("gcc", ["-Og", "-g", "-Wall", "-Werror", "-o", ".build/out", outFile, .. archivePaths]).WaitForExit();
 }
 
 return 0;

compiler/Tokenizer.cs

@@ -77,335 +77,348 @@ public class Tokenizer
             switch (c)
             {
                 case '0' when Peek(1) is 'x':
-                {
-                    Consume();
-                    Consume();
-
-                    var parsed = BigInteger.Zero;
-                    var seenDigit = false;
-
-                    while (TryPeek(out c))
                     {
-                        if (c == '_')
-                        {
-                            Consume();
-                            continue;
-                        }
-
-                        if (!char.IsAsciiHexDigit(c))
-                            break;
-
-                        seenDigit = true;
-                        parsed <<= 4;
-
                         Consume();
-                        parsed += c switch
+                        Consume();
+
+                        var parsed = BigInteger.Zero;
+                        var seenDigit = false;
+
+                        while (TryPeek(out c))
                         {
-                            >= '0' and <= '9' => c - '0',
+                            if (c == '_')
-                            >= 'a' and <= 'f' => c - 'a' + 10,
+                            {
-                            >= 'A' and <= 'F' => c - 'A' + 10,
+                                Consume();
-                            _ => 0
+                                continue;
-                        };
+                            }
+
+                            if (!char.IsAsciiHexDigit(c))
+                                break;
+
+                            seenDigit = true;
+                            parsed <<= 4;
+
+                            Consume();
+                            parsed += c switch
+                            {
+                                >= '0' and <= '9' => c - '0',
+                                >= 'a' and <= 'f' => c - 'a' + 10,
+                                >= 'A' and <= 'F' => c - 'A' + 10,
+                                _ => 0
+                            };
+                        }
+
+                        if (!seenDigit)
+                            throw new CompileException(Diagnostic.Error("Expected hexadecimal digits after 0x").At(fileName, line, startColumn, column - startColumn).Build());
+
+                        return new TokenIntLiteral(line, startColumn, column - startColumn, parsed);
                     }
-
-                    if (!seenDigit)
-                        throw new CompileException(Diagnostic.Error("Expected hexadecimal digits after 0x").At(fileName, line, startColumn, column - startColumn).Build());
-
-                    return new TokenIntLiteral(line, startColumn, column - startColumn, parsed);
-                }
                 case '0' when Peek(1) is 'b':
-                {
-                    Consume();
-                    Consume();
-
-                    var parsed = BigInteger.Zero;
-                    var seenDigit = false;
-
-                    while (TryPeek(out c))
                     {
-                        if (c == '_')
+                        Consume();
+                        Consume();
+
+                        var parsed = BigInteger.Zero;
+                        var seenDigit = false;
+
+                        while (TryPeek(out c))
                         {
-                            Consume();
+                            if (c == '_')
-                            continue;
+                            {
+                                Consume();
+                                continue;
+                            }
+
+                            if (c is not '0' and not '1')
+                                break;
+
+                            seenDigit = true;
+                            parsed <<= 1;
+
+                            if (Consume() == '1')
+                                parsed += BigInteger.One;
                         }
 
-                        if (c is not '0' and not '1')
+                        if (!seenDigit)
-                            break;
+                            throw new CompileException(Diagnostic.Error("Expected binary digits after 0b").At(fileName, line, startColumn, column - startColumn).Build());
 
-                        seenDigit = true;
+                        return new TokenIntLiteral(line, startColumn, column - startColumn, parsed);
-                        parsed <<= 1;
-
-                        if (Consume() == '1')
-                            parsed += BigInteger.One;
                     }
-
-                    if (!seenDigit)
-                        throw new CompileException(Diagnostic.Error("Expected binary digits after 0b").At(fileName, line, startColumn, column - startColumn).Build());
-
-                    return new TokenIntLiteral(line, startColumn, column - startColumn, parsed);
-                }
                 default:
-                {
-                    var parsed = BigInteger.Zero;
-
-                    while (TryPeek(out c))
                     {
-                        if (c == '_')
+                        var parsed = BigInteger.Zero;
+
+                        while (TryPeek(out c))
                         {
-                            Consume();
+                            if (c == '_')
-                            continue;
+                            {
+                                Consume();
+                                continue;
+                            }
+
+                            if (!char.IsDigit(c))
+                                break;
+
+                            parsed *= 10;
+                            parsed += Consume() - '0';
                         }
 
-                        if (!char.IsDigit(c))
+                        return new TokenIntLiteral(line, startColumn, column - startColumn, parsed);
-                            break;
-
-                        parsed *= 10;
-                        parsed += Consume() - '0';
                     }
-
-                    return new TokenIntLiteral(line, startColumn, column - startColumn, parsed);
-                }
             }
         }
 
         switch (c)
         {
             case '"':
-            {
-                Consume();
-                var buf = new StringBuilder();
-
-                while (true)
-                {
-                    if (!TryPeek(out c))
-                        throw new CompileException(Diagnostic.Error("Unterminated string literal").At(fileName, line, column, 0).Build());
-
-                    if (c == '"')
-                        break;
-
-                    if (c == '\n')
-                        throw new CompileException(Diagnostic.Error("Unterminated string literal").At(fileName, line, column, 1).Build());
-
-                    buf.Append(Consume());
-                }
-
-                Consume();
-                return new TokenStringLiteral(line, startColumn, column - startColumn, buf.ToString());
-            }
-
-            case '{':
-            {
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.OpenCurly);
-            }
-            case '}':
-            {
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.CloseCurly);
-            }
-            case '(':
-            {
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.OpenParen);
-            }
-            case ')':
-            {
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.CloseParen);
-            }
-            case ',':
-            {
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Comma);
-            }
-            case '.':
-            {
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Period);
-            }
-            case ':' when Peek(1) is ':':
-            {
-                Consume();
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.ColonColon);
-            }
-            case ':':
-            {
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Colon);
-            }
-            case '^':
-            {
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Caret);
-            }
-            case '!' when Peek(1) is '=':
-            {
-                Consume();
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.BangEqual);
-            }
-            case '!':
-            {
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Bang);
-            }
-            case '=' when Peek(1) is '=':
-            {
-                Consume();
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.EqualEqual);
-            }
-            case '=':
-            {
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Equal);
-            }
-            case '<' when Peek(1) is '<':
-            {
-                Consume();
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.LessThanLessThan);
-            }
-            case '<' when Peek(1) is '=':
-            {
-                Consume();
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.LessThanEqual);
-            }
-            case '<':
-            {
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.LessThan);
-            }
-            case '>' when Peek(1) is '>':
-            {
-                Consume();
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.GreaterThanGreaterThan);
-            }
-            case '>' when Peek(1) is '=':
-            {
-                Consume();
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.GreaterThanEqual);
-            }
-            case '>':
-            {
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.GreaterThan);
-            }
-            case '+' when Peek(1) is '=':
-            {
-                Consume();
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.PlusEqual);
-            }
-            case '+':
-            {
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Plus);
-            }
-            case '-' when Peek(1) is '=':
-            {
-                Consume();
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.MinusEqual);
-            }
-            case '-':
-            {
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Minus);
-            }
-            case '*' when Peek(1) is '=':
-            {
-                Consume();
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.StarEqual);
-            }
-            case '*':
-            {
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Star);
-            }
-            case '/' when Peek(1) is '=':
-            {
-                Consume();
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.ForwardSlashEqual);
-            }
-            case '/':
-            {
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.ForwardSlash);
-            }
-            case '%' when Peek(1) is '=':
-            {
-                Consume();
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.PercentEqual);
-            }
-            case '%':
-            {
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Percent);
-            }
-            case '&' when Peek(1) is '&':
-            {
-                Consume();
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.AmpersandAmpersand);
-            }
-            case '&':
-            {
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Ampersand);
-            }
-            case '|' when Peek(1) is '|':
-            {
-                Consume();
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.PipePipe);
-            }
-            case '|':
-            {
-                Consume();
-                return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Pipe);
-            }
-            default:
-            {
-                if (char.IsLetter(c) || c == '_')
                 {
+                    Consume();
                     var buf = new StringBuilder();
 
-                    while (TryPeek(out c) && (char.IsLetterOrDigit(c) || c == '_'))
+                    while (true)
-                        buf.Append(Consume());
-
-                    var value = buf.ToString();
-
-                    return value switch
                     {
-                        "func" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Func),
+                        if (!TryPeek(out c))
-                        "struct" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Struct),
+                            throw new CompileException(Diagnostic.Error("Unterminated string literal").At(fileName, line, column, 0).Build());
-                        "packed" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Packed),
+
-                        "enum" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Enum),
+                        if (c == '"')
-                        "match" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Match),
+                            break;
-                        "let" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Let),
+
-                        "if" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.If),
+                        if (c == '\n')
-                        "else" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Else),
+                            throw new CompileException(Diagnostic.Error("Unterminated string literal").At(fileName, line, column, 1).Build());
-                        "while" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.While),
+
-                        "return" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Return),
+                        buf.Append(Consume());
-                        "module" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Module),
+                    }
-                        "export" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Export),
+
-                        "extern" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Extern),
+                    Consume();
-                        "true" => new TokenBoolLiteral(line, startColumn, column - startColumn, true),
+                    return new TokenStringLiteral(line, startColumn, column - startColumn, buf.ToString());
-                        "false" => new TokenBoolLiteral(line, startColumn, column - startColumn, false),
-                        _ => new TokenIdent(line, startColumn, column - startColumn, value)
-                    };
                 }
 
-                throw new CompileException(Diagnostic.Error($"Unexpected character '{c}'").At(fileName, line, column, 1).Build());
+            case '{':
-            }
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.OpenCurly);
+                }
+            case '}':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.CloseCurly);
+                }
+            case '[':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.OpenSquare);
+                }
+            case ']':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.CloseSquare);
+                }
+            case '(':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.OpenParen);
+                }
+            case ')':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.CloseParen);
+                }
+            case ',':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Comma);
+                }
+            case '.':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Period);
+                }
+            case ':' when Peek(1) is ':':
+                {
+                    Consume();
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.ColonColon);
+                }
+            case ':':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Colon);
+                }
+            case '^':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Caret);
+                }
+            case '!' when Peek(1) is '=':
+                {
+                    Consume();
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.BangEqual);
+                }
+            case '!':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Bang);
+                }
+            case '=' when Peek(1) is '=':
+                {
+                    Consume();
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.EqualEqual);
+                }
+            case '=':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Equal);
+                }
+            case '<' when Peek(1) is '<':
+                {
+                    Consume();
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.LessThanLessThan);
+                }
+            case '<' when Peek(1) is '=':
+                {
+                    Consume();
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.LessThanEqual);
+                }
+            case '<':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.LessThan);
+                }
+            case '>' when Peek(1) is '>':
+                {
+                    Consume();
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.GreaterThanGreaterThan);
+                }
+            case '>' when Peek(1) is '=':
+                {
+                    Consume();
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.GreaterThanEqual);
+                }
+            case '>':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.GreaterThan);
+                }
+            case '+' when Peek(1) is '=':
+                {
+                    Consume();
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.PlusEqual);
+                }
+            case '+':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Plus);
+                }
+            case '-' when Peek(1) is '=':
+                {
+                    Consume();
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.MinusEqual);
+                }
+            case '-':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Minus);
+                }
+            case '*' when Peek(1) is '=':
+                {
+                    Consume();
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.StarEqual);
+                }
+            case '*':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Star);
+                }
+            case '/' when Peek(1) is '=':
+                {
+                    Consume();
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.ForwardSlashEqual);
+                }
+            case '/':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.ForwardSlash);
+                }
+            case '%' when Peek(1) is '=':
+                {
+                    Consume();
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.PercentEqual);
+                }
+            case '%':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Percent);
+                }
+            case '&' when Peek(1) is '&':
+                {
+                    Consume();
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.AmpersandAmpersand);
+                }
+            case '&':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Ampersand);
+                }
+            case '|' when Peek(1) is '|':
+                {
+                    Consume();
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.PipePipe);
+                }
+            case '|':
+                {
+                    Consume();
+                    return new TokenSymbol(line, startColumn, column - startColumn, Symbol.Pipe);
+                }
+            default:
+                {
+                    if (char.IsLetter(c) || c == '_')
+                    {
+                        var buf = new StringBuilder();
+
+                        while (TryPeek(out c) && (char.IsLetterOrDigit(c) || c == '_'))
+                            buf.Append(Consume());
+
+                        var value = buf.ToString();
+
+                        return value switch
+                        {
+                            "func" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Func),
+                            "struct" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Struct),
+                            "packed" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Packed),
+                            "enum" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Enum),
+                            "new" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.New),
+                            "match" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Match),
+                            "let" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Let),
+                            "if" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.If),
+                            "else" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Else),
+                            "while" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.While),
+                            "for" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.For),
+                            "in" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.In),
+                            "return" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Return),
+                            "module" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Module),
+                            "export" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Export),
+                            "extern" => new TokenKeyword(line, startColumn, column - startColumn, Keyword.Extern),
+                            "true" => new TokenBoolLiteral(line, startColumn, column - startColumn, true),
+                            "false" => new TokenBoolLiteral(line, startColumn, column - startColumn, false),
+                            _ => new TokenIdent(line, startColumn, column - startColumn, value)
+                        };
+                    }
+
+                    throw new CompileException(Diagnostic.Error($"Unexpected character '{c}'").At(fileName, line, column, 1).Build());
+                }
         }
     }
 
@@ -496,6 +509,8 @@ public enum Symbol
     CloseCurly,
     OpenParen,
     CloseParen,
+    OpenSquare,
+    CloseSquare,
     Comma,
     Period,
     Colon,
@@ -538,11 +553,14 @@ public enum Keyword
     Struct,
     Packed,
     Enum,
+    New,
     Match,
     Let,
     If,
     Else,
     While,
+    For,
+    In,
     Return,
     Module,
     Export,
@@ -564,6 +582,8 @@ public static class TokenExtensions
             Symbol.CloseCurly => "}",
             Symbol.OpenParen => "(",
             Symbol.CloseParen => ")",
+            Symbol.OpenSquare => "[",
+            Symbol.CloseSquare => "]",
             Symbol.Comma => ",",
             Symbol.Period => ".",
             Symbol.Colon => ":",
@@ -605,11 +625,14 @@ public static class TokenExtensions
             Keyword.Struct => "struct",
             Keyword.Packed => "packed",
             Keyword.Enum => "enum",
+            Keyword.New => "new",
             Keyword.Match => "enum",
             Keyword.Let => "let",
             Keyword.If => "if",
             Keyword.Else => "else",
             Keyword.While => "while",
+            Keyword.For => "for",
+            Keyword.In => "in",
             Keyword.Return => "return",
             Keyword.Module => "module",
             Keyword.Export => "export",

compiler/TypeChecker.cs

@@ -24,7 +24,7 @@ public class TypeChecker
     private readonly NodeDefinitionFunc function;
     private NubType functionReturnType = null!;
     private readonly ModuleGraph moduleGraph;
-    private readonly Scope scope = new();
+    private readonly Stack<Dictionary<string, NubType>> scopes = new();
 
     private TypedNodeDefinitionFunc? CheckFunction(out List<Diagnostic> diagnostics)
     {
@@ -51,7 +51,7 @@ public class TypeChecker
             }
         }
 
-        using (scope.EnterScope())
+        using (EnterScope())
         {
             foreach (var parameter in function.Parameters)
             {
@@ -60,6 +60,7 @@ public class TypeChecker
                 try
                 {
                     parameterType = ResolveType(parameter.Type);
+                    DeclareLocalIdentifier(parameter.Name, parameterType);
                 }
                 catch (CompileException e)
                 {
@@ -68,7 +69,6 @@ public class TypeChecker
                     continue;
                 }
 
-                scope.DeclareIdentifier(parameter.Name.Ident, parameterType);
                 parameters.Add(new TypedNodeDefinitionFunc.Param(parameter.Tokens, parameter.Name, parameterType));
             }
 
@@ -99,6 +99,7 @@ public class TypeChecker
             NodeStatementReturn statement => CheckStatementReturn(statement),
             NodeStatementVariableDeclaration statement => CheckStatementVariableDeclaration(statement),
             NodeStatementWhile statement => CheckStatementWhile(statement),
+            NodeStatementFor statement => CheckStatementFor(statement),
             NodeStatementMatch statement => CheckStatementMatch(statement),
             _ => throw new ArgumentOutOfRangeException(nameof(node))
         };
@@ -114,7 +115,7 @@ public class TypeChecker
 
     private TypedNodeStatementBlock CheckStatementBlock(NodeStatementBlock statement)
     {
-        using (scope.EnterScope())
+        using (EnterScope())
         {
             var statements = statement.Statements.Select(CheckStatement).ToList();
             return new TypedNodeStatementBlock(statement.Tokens, statements);
@@ -137,19 +138,40 @@ public class TypeChecker
         if (!condition.Type.IsAssignableTo(NubTypeBool.Instance))
             throw BasicError("Condition part of if statement must be a boolean", condition);
 
-        var thenBlock = CheckStatement(statement.ThenBlock);
+        TypedNodeStatement thenBlock;
-        var elseBlock = statement.ElseBlock == null ? null : CheckStatement(statement.ElseBlock);
+
+        using (EnterScope())
+        {
+            thenBlock = CheckStatement(statement.ThenBlock);
+        }
+
+        TypedNodeStatement? elseBlock;
+
+        using (EnterScope())
+        {
+            elseBlock = statement.ElseBlock == null ? null : CheckStatement(statement.ElseBlock);
+        }
 
         return new TypedNodeStatementIf(statement.Tokens, condition, thenBlock, elseBlock);
     }
 
     private TypedNodeStatementReturn CheckStatementReturn(NodeStatementReturn statement)
     {
-        var value = CheckExpression(statement.Value, functionReturnType);
+        if (statement.Value == null)
-        if (!value.Type.IsAssignableTo(functionReturnType))
+        {
-            throw BasicError($"Type of returned value ({value.Type}) is not assignable to the return type of the function ({functionReturnType})", value);
+            if (functionReturnType is not NubTypeVoid)
+                throw BasicError($"Missing return value. Expected '{functionReturnType}'", statement);
 
-        return new TypedNodeStatementReturn(statement.Tokens, value);
+            return new TypedNodeStatementReturn(statement.Tokens, null);
+        }
+        else
+        {
+            var value = CheckExpression(statement.Value, functionReturnType);
+            if (!value.Type.IsAssignableTo(functionReturnType))
+                throw BasicError($"Type of returned value ({value.Type}) is not assignable to the return type of the function ({functionReturnType})", value);
+
+            return new TypedNodeStatementReturn(statement.Tokens, value);
+        }
     }
 
     private TypedNodeStatementVariableDeclaration CheckStatementVariableDeclaration(NodeStatementVariableDeclaration statement)
@@ -165,7 +187,7 @@ public class TypeChecker
 
         type ??= value.Type;
 
-        scope.DeclareIdentifier(statement.Name.Ident, type);
+        DeclareLocalIdentifier(statement.Name, type);
 
         return new TypedNodeStatementVariableDeclaration(statement.Tokens, statement.Name, type, value);
     }
@@ -176,9 +198,27 @@ public class TypeChecker
         if (!condition.Type.IsAssignableTo(NubTypeBool.Instance))
             throw BasicError("Condition part of if statement must be a boolean", condition);
 
-        var body = CheckStatement(statement.Body);
+        using (EnterScope())
+        {
+            var body = CheckStatement(statement.Body);
+            return new TypedNodeStatementWhile(statement.Tokens, condition, body);
+        }
+    }
 
-        return new TypedNodeStatementWhile(statement.Tokens, condition, body);
+    private TypedNodeStatementFor CheckStatementFor(NodeStatementFor statement)
+    {
+        var array = CheckExpression(statement.Array, null);
+        if (array.Type is not NubTypeArray arrayType)
+            throw BasicError($"Cannot iterate over non-array type '{array.Type}'", statement.Array);
+
+        TypedNodeStatement body;
+        using (EnterScope())
+        {
+            DeclareLocalIdentifier(statement.VariableName, arrayType.ElementType);
+            body = CheckStatement(statement.Body);
+        }
+
+        return new TypedNodeStatementFor(statement.Tokens, statement.VariableName, array, body);
     }
 
     private TypedNodeStatementMatch CheckStatementMatch(NodeStatementMatch statement)
@@ -198,21 +238,30 @@ public class TypeChecker
         var cases = new List<TypedNodeStatementMatch.Case>();
         foreach (var @case in statement.Cases)
         {
-            if (!enumInfo.Variants.Any(x => x.Name == @case.Variant.Ident))
+            var variant = enumInfo.Variants.FirstOrDefault(x => x.Name == @case.Variant.Ident);
+            if (variant == null)
                 throw BasicError($"Enum type'{enumType}' does not have a variant named '{@case.Variant.Ident}'", @case.Variant);
 
             uncoveredCases.Remove(@case.Variant.Ident);
 
-            using (scope.EnterScope())
+            using (EnterScope())
             {
-                scope.DeclareIdentifier(@case.VariableName.Ident, NubTypeEnumVariant.Get(NubTypeEnum.Get(enumType.Module, enumType.Name), @case.Variant.Ident));
+                if (@case.VariableName != null)
+                {
+                    if (variant.Type is null)
+                        throw BasicError("Cannot capture variable for enum variant without type", @case.VariableName);
+
+                    DeclareLocalIdentifier(@case.VariableName, variant.Type);
+                }
+
                 var body = CheckStatement(@case.Body);
+
                 cases.Add(new TypedNodeStatementMatch.Case(@case.Tokens, @case.Variant, @case.VariableName, body));
             }
         }
 
         if (uncoveredCases.Any())
-            throw BasicError($"Match statement does not cover the following cases: {string.Join(", ",  uncoveredCases)}", statement);
+            throw BasicError($"Match statement does not cover the following cases: {string.Join(", ", uncoveredCases)}", statement);
 
         return new TypedNodeStatementMatch(statement.Tokens, target, cases);
     }
@@ -231,6 +280,8 @@ public class TypeChecker
             NodeExpressionStringLiteral expression => CheckExpressionStringLiteral(expression, expectedType),
             NodeExpressionStructLiteral expression => CheckExpressionStructLiteral(expression, expectedType),
             NodeExpressionEnumLiteral expression => CheckExpressionEnumLiteral(expression, expectedType),
+            NodeExpressionStringConstructor expression => CheckExpressionStringConstructor(expression, expectedType),
+            NodeExpressionArrayLiteral expression => CheckExpressionArrayLiteral(expression, expectedType),
             _ => throw new ArgumentOutOfRangeException(nameof(node))
         };
     }
@@ -245,6 +296,24 @@ public class TypeChecker
         switch (expression.Operation)
         {
             case NodeExpressionBinary.Op.Add:
+                {
+                    if (left.Type is NubTypeString)
+                    {
+                        if (right.Type is not NubTypeString)
+                            throw BasicError("Right hand side of string concatination operator must be a string", right);
+
+                        return new TypedNodeExpressionBinary(expression.Tokens, NubTypeString.Instance, left, CheckExpressionBinaryOperation(expression.Operation), right);
+                    }
+
+                    if (left.Type is not NubTypeSInt and not NubTypeUInt)
+                        throw BasicError($"Unsupported type for left hand side arithmetic operation: {left.Type}", left);
+
+                    if (right.Type is not NubTypeSInt and not NubTypeUInt)
+                        throw BasicError($"Unsupported type for right hand side arithmetic operation: {right.Type}", right);
+
+                    type = left.Type;
+                    break;
+                }
             case NodeExpressionBinary.Op.Subtract:
             case NodeExpressionBinary.Op.Multiply:
             case NodeExpressionBinary.Op.Divide:
@@ -379,14 +448,14 @@ public class TypeChecker
     {
         if (expression.Sections.Count == 1)
         {
-            var name = expression.Sections[0].Ident;
+            var name = expression.Sections[0];
 
-            var localType = scope.GetIdentifierType(name);
+            var localType = GetIdentifierType(name.Ident);
             if (localType is not null)
-                return new TypedNodeExpressionLocalIdent(expression.Tokens, localType, name);
+                return new TypedNodeExpressionLocalIdent(expression.Tokens, localType, name.Ident);
 
-            if (moduleGraph.TryResolveIdentifier(currentModule, name, true, out var ident))
+            if (moduleGraph.TryResolveIdentifier(currentModule, name.Ident, true, out var ident))
-                return new TypedNodeExpressionGlobalIdent(expression.Tokens, ident.Type, currentModule, name);
+                return new TypedNodeExpressionGlobalIdent(expression.Tokens, ident.Type, currentModule, name.Ident);
         }
         else if (expression.Sections.Count == 2)
         {
@@ -419,42 +488,54 @@ public class TypeChecker
         switch (target.Type)
         {
             case NubTypeString stringType:
-            {
-                switch (expression.Name.Ident)
                 {
-                    case "length":
+                    switch (expression.Name.Ident)
-                        return new TypedNodeExpressionStringLength(expression.Tokens, NubTypeUInt.Get(64), target);
+                    {
-                    case "ptr":
+                        case "length":
-                        return new TypedNodeExpressionStringPointer(expression.Tokens, NubTypePointer.Get(NubTypeUInt.Get(8)), target);
+                            return new TypedNodeExpressionStringLength(expression.Tokens, NubTypeUInt.Get(64), target);
-                    default:
+                        case "ptr":
-                        throw BasicError($"'{expression.Name.Ident}' is not a member of type string", expression.Name);
+                            return new TypedNodeExpressionStringPointer(expression.Tokens, NubTypePointer.Get(NubTypeChar.Instance), target);
+                        default:
+                            throw BasicError($"'{expression.Name.Ident}' is not a member of type {stringType}", expression.Name);
+                    }
+                }
+            case NubTypeArray arrayType:
+                {
+                    switch (expression.Name.Ident)
+                    {
+                        case "count":
+                            return new TypedNodeExpressionArrayCount(expression.Tokens, NubTypeUInt.Get(64), target);
+                        case "ptr":
+                            return new TypedNodeExpressionArrayPointer(expression.Tokens, NubTypePointer.Get(arrayType.ElementType), target);
+                        default:
+                            throw BasicError($"'{expression.Name.Ident}' is not a member of type {arrayType}", expression.Name);
+                    }
                 }
-            }
             case NubTypeStruct structType:
-            {
+                {
-                if (!moduleGraph.TryResolveModule(structType.Module, out var module))
+                    if (!moduleGraph.TryResolveModule(structType.Module, out var module))
-                    throw BasicError($"Module '{structType.Module}' not found", expression.Target);
+                        throw BasicError($"Module '{structType.Module}' not found", expression.Target);
 
-                if (!module.TryResolveType(structType.Name, currentModule == structType.Module, out var typeDef))
+                    if (!module.TryResolveType(structType.Name, currentModule == structType.Module, out var typeDef))
-                    throw BasicError($"Type '{structType.Name}' not found in module '{structType.Module}'", expression.Target);
+                        throw BasicError($"Type '{structType.Name}' not found in module '{structType.Module}'", expression.Target);
 
-                if (typeDef is not Module.TypeInfoStruct structDef)
+                    if (typeDef is not Module.TypeInfoStruct structDef)
-                    throw BasicError($"Type '{target.Type}' is not a struct", expression.Target);
+                        throw BasicError($"Type '{target.Type}' is not a struct", expression.Target);
 
-                var field = structDef.Fields.FirstOrDefault(x => x.Name == expression.Name.Ident);
+                    var field = structDef.Fields.FirstOrDefault(x => x.Name == expression.Name.Ident);
-                if (field == null)
+                    if (field == null)
-                    throw BasicError($"Struct '{target.Type}' does not have a field matching the name '{expression.Name.Ident}'", target);
+                        throw BasicError($"Struct '{target.Type}' does not have a field matching the name '{expression.Name.Ident}'", target);
 
-                return new TypedNodeExpressionStructMemberAccess(expression.Tokens, field.Type, target, expression.Name);
+                    return new TypedNodeExpressionStructMemberAccess(expression.Tokens, field.Type, target, expression.Name);
-            }
+                }
             case NubTypeAnonymousStruct anonymousStructType:
-            {
+                {
-                var field = anonymousStructType.Fields.FirstOrDefault(x => x.Name == expression.Name.Ident);
+                    var field = anonymousStructType.Fields.FirstOrDefault(x => x.Name == expression.Name.Ident);
-                if (field == null)
+                    if (field == null)
-                    throw BasicError($"Struct '{target.Type}' does not have a field matching the name '{expression.Name.Ident}'", target);
+                        throw BasicError($"Struct '{target.Type}' does not have a field matching the name '{expression.Name.Ident}'", target);
 
-                return new TypedNodeExpressionStructMemberAccess(expression.Tokens, field.Type, target, expression.Name);
+                    return new TypedNodeExpressionStructMemberAccess(expression.Tokens, field.Type, target, expression.Name);
-            }
+                }
             default:
                 throw BasicError($"{target.Type} has no member '{expression.Name.Ident}'", target);
         }
@@ -474,7 +555,7 @@ public class TypeChecker
         {
             var parameter = CheckExpression(expression.Parameters[i], funcType.Parameters[i]);
             if (!parameter.Type.IsAssignableTo(funcType.Parameters[i]))
-                throw BasicError($"Parameter {i + 1} does is not assignable to '{funcType.Parameters[i]}'", parameter);
+                throw BasicError($"Parameter {i + 1} ({parameter.Type}) does is not assignable to '{funcType.Parameters[i]}'", parameter);
 
             parameters.Add(parameter);
         }
@@ -590,10 +671,53 @@ public class TypeChecker
         if (variant == null)
             throw BasicError($"Enum '{variantType.EnumType}' does not have a variant named '{variantType.Variant}'", expression.Type);
 
-        var value = CheckExpression(expression.Value, variant.Type);
+        if (expression.Value == null && variant.Type is not null)
+            throw BasicError($"Enum variant '{variantType}' expects a value of type '{variant.Type}'", expression.Type);
+
+        if (expression.Value != null && variant.Type is null)
+            throw BasicError($"Enum variant '{variantType}' does not expect any data", expression.Value);
+
+        var value = expression.Value == null ? null : CheckExpression(expression.Value, variant.Type);
+
         return new TypedNodeExpressionEnumLiteral(expression.Tokens, type, value);
     }
 
+    private TypedNodeExpressionStringConstructor CheckExpressionStringConstructor(NodeExpressionStringConstructor expression, NubType? expectedType)
+    {
+        var stringPoitnerType = NubTypePointer.Get(NubTypeChar.Instance);
+
+        var value = CheckExpression(expression.Value, stringPoitnerType);
+        if (!value.Type.IsAssignableTo(stringPoitnerType))
+            throw BasicError($"Value of string constructor must be assignable to {stringPoitnerType}", value);
+
+        return new TypedNodeExpressionStringConstructor(expression.Tokens, NubTypeString.Instance, value);
+    }
+
+    private TypedNodeExpressionArrayLiteral CheckExpressionArrayLiteral(NodeExpressionArrayLiteral expression, NubType? expectedType)
+    {
+        NubType? elementType = null;
+        if (expectedType is NubTypeArray arrayType)
+            elementType = arrayType.ElementType;
+
+        var values = new List<TypedNodeExpression>();
+
+        foreach (var value in expression.Values)
+        {
+            var checkedValue = CheckExpression(value, elementType);
+            elementType ??= checkedValue.Type;
+
+            if (!checkedValue.Type.IsAssignableTo(elementType))
+                throw BasicError($"Type '{checkedValue.Type}' is not assignable to type of element '{elementType}'", checkedValue);
+
+            values.Add(checkedValue);
+        }
+
+        if (elementType is null)
+            throw BasicError("Unable to infer type of array element", expression);
+
+        return new TypedNodeExpressionArrayLiteral(expression.Tokens, NubTypeArray.Get(elementType), values);
+    }
+
     private NubType ResolveType(NodeType node)
     {
         return node switch
@@ -607,6 +731,7 @@ public class TypeChecker
             NodeTypeUInt type => NubTypeUInt.Get(type.Width),
             NodeTypeString => NubTypeString.Instance,
             NodeTypeVoid => NubTypeVoid.Instance,
+            NodeTypeArray type => NubTypeArray.Get(ResolveType(type.ElementType)),
             _ => throw new ArgumentOutOfRangeException(nameof(node))
         };
     }
@@ -711,45 +836,44 @@ public class TypeChecker
         return new CompileException(Diagnostic.Error(message).At(fileName, node).Build());
     }
 
-    private sealed class Scope
+    public void DeclareLocalIdentifier(TokenIdent name, NubType type)
     {
-        private readonly Stack<Dictionary<string, NubType>> scopes = new();
+        var existing = GetIdentifierType(name.Ident);
+        if (existing is not null)
+            throw BasicError($"Local identifier '{name.Ident}' is already defined", name);
 
-        public IDisposable EnterScope()
+        scopes.Peek().Add(name.Ident, type);
-        {
+    }
-            scopes.Push([]);
-            return new ScopeGuard(this);
-        }
 
-        public void DeclareIdentifier(string name, NubType type)
+    public NubType? GetIdentifierType(string name)
+    {
+        foreach (var scope in scopes)
         {
-            scopes.Peek().Add(name, type);
+            if (scope.TryGetValue(name, out var type))
-        }
-
-        public NubType? GetIdentifierType(string name)
-        {
-            foreach (var scope in scopes)
             {
-                if (scope.TryGetValue(name, out var type))
+                return type;
-                {
-                    return type;
-                }
             }
-
-            return null;
         }
 
-        private void ExitScope()
+        return null;
-        {
+    }
-            scopes.Pop();
-        }
 
-        private sealed class ScopeGuard(Scope owner) : IDisposable
+    public IDisposable EnterScope()
+    {
+        scopes.Push([]);
+        return new ScopeGuard(this);
+    }
+
+    private void ExitScope()
+    {
+        scopes.Pop();
+    }
+
+    private sealed class ScopeGuard(TypeChecker owner) : IDisposable
+    {
+        public void Dispose()
         {
-            public void Dispose()
+            owner.ExitScope();
-            {
-                owner.ExitScope();
-            }
         }
     }
 }
@@ -796,9 +920,9 @@ public class TypedNodeStatementFuncCall(List<Token> tokens, TypedNodeExpression
     public List<TypedNodeExpression> Parameters { get; } = parameters;
 }
 
-public class TypedNodeStatementReturn(List<Token> tokens, TypedNodeExpression value) : TypedNodeStatement(tokens)
+public class TypedNodeStatementReturn(List<Token> tokens, TypedNodeExpression? value) : TypedNodeStatement(tokens)
 {
-    public TypedNodeExpression Value { get; } = value;
+    public TypedNodeExpression? Value { get; } = value;
 }
 
 public class TypedNodeStatementVariableDeclaration(List<Token> tokens, TokenIdent name, NubType type, TypedNodeExpression value) : TypedNodeStatement(tokens)
@@ -827,15 +951,22 @@ public class TypedNodeStatementWhile(List<Token> tokens, TypedNodeExpression con
     public TypedNodeStatement Body { get; } = body;
 }
 
+public class TypedNodeStatementFor(List<Token> tokens, TokenIdent variableName, TypedNodeExpression array, TypedNodeStatement body) : TypedNodeStatement(tokens)
+{
+    public TokenIdent VariableName { get; } = variableName;
+    public TypedNodeExpression Array { get; } = array;
+    public TypedNodeStatement Body { get; } = body;
+}
+
 public class TypedNodeStatementMatch(List<Token> tokens, TypedNodeExpression target, List<TypedNodeStatementMatch.Case> cases) : TypedNodeStatement(tokens)
 {
     public TypedNodeExpression Target { get; } = target;
     public List<Case> Cases { get; } = cases;
 
-    public class Case(List<Token> tokens, TokenIdent type, TokenIdent variableName, TypedNodeStatement body) : Node(tokens)
+    public class Case(List<Token> tokens, TokenIdent type, TokenIdent? variableName, TypedNodeStatement body) : Node(tokens)
     {
         public TokenIdent Variant { get; } = type;
-        public TokenIdent VariableName { get; } = variableName;
+        public TokenIdent? VariableName { get; } = variableName;
         public TypedNodeStatement Body { get; } = body;
     }
 }
@@ -871,11 +1002,21 @@ public class TypedNodeExpressionStructLiteral(List<Token> tokens, NubType type,
     }
 }
 
-public class TypedNodeExpressionEnumLiteral(List<Token> tokens, NubType type, TypedNodeExpression value) : TypedNodeExpression(tokens, type)
+public class TypedNodeExpressionEnumLiteral(List<Token> tokens, NubType type, TypedNodeExpression? value) : TypedNodeExpression(tokens, type)
+{
+    public TypedNodeExpression? Value { get; } = value;
+}
+
+public class TypedNodeExpressionStringConstructor(List<Token> tokens, NubType type, TypedNodeExpression value) : TypedNodeExpression(tokens, type)
 {
     public TypedNodeExpression Value { get; } = value;
 }
 
+public class TypedNodeExpressionArrayLiteral(List<Token> tokens, NubType type, List<TypedNodeExpression> values) : TypedNodeExpression(tokens, type)
+{
+    public List<TypedNodeExpression> Values { get; } = values;
+}
+
 public class TypedNodeExpressionStructMemberAccess(List<Token> tokens, NubType type, TypedNodeExpression target, TokenIdent name) : TypedNodeExpression(tokens, type)
 {
     public TypedNodeExpression Target { get; } = target;
@@ -892,6 +1033,16 @@ public class TypedNodeExpressionStringPointer(List<Token> tokens, NubType type,
     public TypedNodeExpression Target { get; } = target;
 }
 
+public class TypedNodeExpressionArrayCount(List<Token> tokens, NubType type, TypedNodeExpression target) : TypedNodeExpression(tokens, type)
+{
+    public TypedNodeExpression Target { get; } = target;
+}
+
+public class TypedNodeExpressionArrayPointer(List<Token> tokens, NubType type, TypedNodeExpression target) : TypedNodeExpression(tokens, type)
+{
+    public TypedNodeExpression Target { get; } = target;
+}
+
 public class TypedNodeExpressionFuncCall(List<Token> tokens, NubType type, TypedNodeExpression target, List<TypedNodeExpression> parameters) : TypedNodeExpression(tokens, type)
 {
     public TypedNodeExpression Target { get; } = target;

examples/build

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+
+SCRIPT_DIR=$(dirname "$0")
+
+pushd $SCRIPT_DIR
+    pushd ../compiler
+        dotnet build -c Release
+    popd
+
+    pushd core
+        time ../../compiler/bin/Release/net9.0/Compiler sys.nub print.nub --type=lib
+    popd
+
+    pushd program
+        time ../../compiler/bin/Release/net9.0/Compiler main.nub ../core/.build/out.nublib
+    popd
+
+    ./program/.build/out
+popd

examples/build.sh

@@ -1,15 +0,0 @@
-set -e
-
-pushd core
-dotnet run --project ../../compiler mem.nub print.nub --type=lib
-popd
-
-pushd math
-dotnet run --project ../../compiler math.nub --type=lib
-popd
-
-pushd program
-dotnet run --project ../../compiler main.nub ../math/.build/out.nublib ../core/.build/out.nublib
-popd
-
-./program/.build/out

examples/core/mem.nub

@@ -1,4 +0,0 @@
-module core
-
-export extern func malloc(size: u64): ^void
-export extern func free(size: ^void)

examples/core/print.nub

@@ -1,8 +1,10 @@
 module core
 
-extern func puts(text: ^u8)
+export func print(text: string) {
-
+    sys::write(0, text.ptr, text.length)
-export func print(text: string)
+}
-{
+
-    puts(text.ptr)
+export func println(text: string) {
+    print(text)
+    print("\n")
 }

examples/core/sys.nub

@@ -0,0 +1,5 @@
+module sys
+
+export extern func read(fd: u32, buf: ^char, count: u64): i64
+export extern func write(fd: u32, buf: ^char, count: u64): i64
+export extern func open(fileName: ^char, flags: i32, mode: u16): i64

examples/math/math.nub

@@ -1,44 +0,0 @@
-module math
-
-export struct Human {
-    name: string
-    age: i32
-}
-
-export struct Pos {
-    x: i32
-    y: i32
-}
-
-export enum Message {
-    Quit: {}
-    Move: Pos
-}
-
-let x: i32
-
-export func add(a: i32 b: i32): i32
-{
-    let x = "test"
-
-    let msg: Message = enum Message::Move { 
-        x = 10
-        y = 10
-    }
-
-    match msg {
-        Quit q {
-            // quit
-        }
-        Move m {
-            // move
-        }
-    }
-
-    return add_internal(a b)
-}
-
-func add_internal(a: i32 b: i32): i32
-{
-    return a + b
-}

examples/program/main.nub

@@ -1,9 +1,32 @@
 module main
 
-func main(): i32
+struct Human {
-{
+    name: string
-    core::print("Hello, world")
+    age: i32
-    let ptr = core::malloc(64)
+}
-    core::free(ptr)
+
+enum Message {
+    Quit
+    Say: string
+}
+
+func main(): i32 {
+
+    let x = new string("test".ptr) + " " + "uwu"
+    core::println(x)
+
+    let messages: []Message = [new Message::Say("first"), new Message::Quit]
+
+    for message in messages {
+        match message {
+            Say msg {
+                core::println(msg)
+            }
+            Quit {
+                core::println("quit")
+            }
+        }
+    }
+
     return 0
 }