...

bindings/generate.py

@@ -106,10 +106,11 @@ if tu.diagnostics:
         if diag.severity >= clang.cindex.Diagnostic.Error:
             print(f"Error: {diag.spelling}", file=sys.stderr)
 
-print(f'module "{os.path.basename(filename).split(".")[0]}"')
+print(f'module {os.path.basename(filename).split(".")[0]}')
 print()
 
 seen_structs = []
+seen_enums = []
 
 for cursor in tu.cursor.walk_preorder():
     if cursor.location.file and cursor.location.file.name != filename:
@@ -151,16 +152,22 @@ for cursor in tu.cursor.walk_preorder():
             print("}")
 
     elif cursor.kind == CursorKind.ENUM_DECL:
-        name = cursor.spelling
+        if cursor.get_usr() in seen_enums:
-        print(f"export enum {name} : u32")
+            continue
-        print("{")
+
-        for field in cursor.get_children():
+        seen_enums.append(cursor.get_usr())
-            if field.kind == CursorKind.ENUM_CONSTANT_DECL:
+
-                field_name = field.spelling
+        if cursor.is_definition():
-                field_value = field.enum_value
+            name = cursor.spelling
-                print(f"    {field_name} = {field_value}")
+            print(f"export enum {name} : u32")
-            else:
+            print("{")
-                raise Exception(
+            for field in cursor.get_children():
-                    f"Unsupported child of enum: {field.spelling}: {field.kind}"
+                if field.kind == CursorKind.ENUM_CONSTANT_DECL:
-                )
+                    field_name = field.spelling
-        print("}")
+                    field_value = field.enum_value
+                    print(f"    {field_name} = {field_value}")
+                else:
+                    raise Exception(
+                        f"Unsupported child of enum: {field.spelling}: {field.kind}"
+                    )
+            print("}")

compiler/NubLang.LSP/WorkspaceManager.cs

@@ -19,6 +19,9 @@ public class WorkspaceManager(DiagnosticsPublisher diagnosticsPublisher)
 
     public void SetRootPath(string rootPath)
     {
+        _units.Clear();
+        _possiblyOutdatedTopLevelNodes.Clear();
+        _repository = new ModuleRepository([]);
         _rootPath = rootPath;
         Update();
     }

compiler/NubLang/Ast/Node.cs

@@ -632,4 +632,12 @@ public class ConstArrayInitializerNode(List<Token> tokens, NubType type, List<Ex
     }
 }
 
+public class EnumTypeIntermediateNode(List<Token> tokens, NubType type) : ExpressionNode(tokens, type)
+{
+    public override IEnumerable<Node> Children()
+    {
+        return [];
+    }
+}
+
 #endregion

compiler/NubLang/Ast/TypeChecker.cs

@@ -837,6 +837,11 @@ public sealed class TypeChecker
                 return new ModuleFuncIdentifierNode(expression.Tokens, type, expression.ModuleToken, expression.NameToken, function.ExternSymbolToken);
             }
 
+            if (module.TryResolveEnum(expression.NameToken, out var enumType, out var _))
+            {
+                return new EnumTypeIntermediateNode(expression.Tokens, enumType);
+            }
+
             throw new CompileException(Diagnostic
                 .Error($"Module {expression.ModuleToken.Value} does not export a member named {expression.NameToken.Value}")
                 .At(expression, _syntaxTree.Tokens)
@@ -920,6 +925,29 @@ public sealed class TypeChecker
 
                 return new StructFieldAccessNode(expression.Tokens, field.Type, target, expression.MemberToken);
             }
+            case NubEnumType enumType:
+            {
+                if (!enumType.Members.TryGetValue(expression.MemberToken.Value, out var value))
+                {
+                    throw new CompileException(Diagnostic
+                        .Error($"Enum {target.Type} does not have a member with the name {expression.MemberToken.Value}")
+                        .At(expression, _syntaxTree.Tokens)
+                        .Build());
+                }
+
+                return (enumType.UnderlyingType.Width, enumType.UnderlyingType.Signed) switch
+                {
+                    (8, false) => new U8LiteralNode(expression.Tokens, (byte)value),
+                    (16, false) => new U16LiteralNode(expression.Tokens, (ushort)value),
+                    (32, false) => new U32LiteralNode(expression.Tokens, (uint)value),
+                    (64, false) => new U64LiteralNode(expression.Tokens, value),
+                    (8, true) => new I8LiteralNode(expression.Tokens, (sbyte)value),
+                    (16, true) => new I16LiteralNode(expression.Tokens, (short)value),
+                    (32, true) => new I32LiteralNode(expression.Tokens, (int)value),
+                    (64, true) => new I64LiteralNode(expression.Tokens, (long)value),
+                    _ => throw new ArgumentOutOfRangeException()
+                };
+            }
             default:
             {
                 throw new CompileException(Diagnostic
@@ -1062,7 +1090,7 @@ public sealed class TypeChecker
             return structType;
         }
 
-        var enumType = module.EnumTypes.GetValueOrDefault(customType.NameToken.Value);
+        var enumType = module.EnumTypes.FirstOrDefault(x => x.Name == customType.NameToken.Value);
         if (enumType != null)
         {
             return enumType;

compiler/NubLang/Generation/LlvmSharpGenerator.cs

@@ -16,6 +16,9 @@ public class LlvmSharpGenerator
     private readonly Dictionary<string, LLVMValueRef> _functions = new();
     private readonly Dictionary<string, LLVMValueRef> _locals = new();
     private readonly Stack<(LLVMBasicBlockRef breakBlock, LLVMBasicBlockRef continueBlock)> _loopStack = new();
+    private readonly Stack<Scope> _scopes = new();
+
+    private Scope CurrentScope => _scopes.Peek();
 
     public void Emit(List<TopLevelNode> topLevelNodes, ModuleRepository repository, string sourceFileName, string outputPath)
     {
@@ -32,50 +35,97 @@ public class LlvmSharpGenerator
         _functions.Clear();
         _locals.Clear();
         _loopStack.Clear();
+        _scopes.Clear();
 
         var stringType = _context.CreateNamedStruct("nub.string");
         stringType.StructSetBody([LLVMTypeRef.Int64, LLVMTypeRef.CreatePointer(LLVMTypeRef.Int8, 0)], false);
         _structTypes["nub.string"] = stringType;
 
+        // note(nub31): Declare all structs and functions
         foreach (var module in repository.GetAll())
         {
             foreach (var structType in module.StructTypes)
             {
-                var structName = StructName(structType.Module, structType.Name);
+                var llvmStructType = _context.CreateNamedStruct(StructName(structType.Module, structType.Name));
-                var llvmStructType = _context.CreateNamedStruct(structName);
+                llvmStructType.StructSetBody(structType.Fields.Select(f => MapType(f.Type)).ToArray(), structType.Packed);
-                _structTypes[structName] = llvmStructType;
+                _structTypes[StructName(structType.Module, structType.Name)] = llvmStructType;
-            }
-        }
 
-        foreach (var module in repository.GetAll())
+                var constructorType = LLVMTypeRef.CreateFunction(LLVMTypeRef.Void, [LLVMTypeRef.CreatePointer(llvmStructType, 0)]);
-        {
+                var constructor = _llvmModule.AddFunction(StructConstructorName(structType.Module, structType.Name), constructorType);
-            foreach (var structType in module.StructTypes)
+
-            {
+                _functions[StructConstructorName(structType.Module, structType.Name)] = constructor;
-                var structName = StructName(structType.Module, structType.Name);
+            }
-                var llvmStructType = _structTypes[structName];
-                var fieldTypes = structType.Fields.Select(f => MapType(f.Type)).ToArray();
-                llvmStructType.StructSetBody(fieldTypes, false);
-            }
-        }
 
-        foreach (var module in repository.GetAll())
-        {
             foreach (var prototype in module.FunctionPrototypes)
             {
-                CreateFunctionDeclaration(prototype, module.Name);
+                var funcName = FuncName(module.Name, prototype.NameToken.Value, prototype.ExternSymbolToken?.Value);
+
+                var paramTypes = prototype.Parameters.Select(p => MapType(p.Type)).ToArray();
+                var funcType = LLVMTypeRef.CreateFunction(MapType(prototype.ReturnType), paramTypes);
+                var func = _llvmModule.AddFunction(funcName, funcType);
+
+                func.FunctionCallConv = (uint)LLVMCallConv.LLVMCCallConv;
+
+                _functions[funcName] = func;
             }
         }
 
+        // note(nub31): Define struct constructors
         foreach (var structNode in topLevelNodes.OfType<StructNode>())
         {
-            EmitStructConstructor(structNode);
+            var structType = _structTypes[StructName(_module, structNode.NameToken.Value)];
+            var constructor = _functions[StructConstructorName(_module, structNode.NameToken.Value)];
+
+            var entryBlock = constructor.AppendBasicBlock("entry");
+            _builder.PositionAtEnd(entryBlock);
+
+            var selfParam = constructor.GetParam(0);
+            selfParam.Name = "self";
+
+            _locals.Clear();
+
+            foreach (var field in structNode.Fields)
+            {
+                if (field.Value == null) continue;
+
+                var index = structNode.StructType.GetFieldIndex(field.NameToken.Value);
+                var fieldPtr = _builder.BuildStructGEP2(structType, selfParam, (uint)index);
+                EmitExpressionInto(field.Value, fieldPtr);
+            }
+
+            _builder.BuildRetVoid();
         }
 
+        // note(nub31): Define function bodies
         foreach (var funcNode in topLevelNodes.OfType<FuncNode>())
         {
-            if (funcNode.Body != null)
+            if (funcNode.Body == null) continue;
+
+            var funcName = FuncName(_module, funcNode.Prototype.NameToken.Value, funcNode.Prototype.ExternSymbolToken?.Value);
+            var func = _functions[funcName];
+
+            var entryBlock = func.AppendBasicBlock("entry");
+            _builder.PositionAtEnd(entryBlock);
+
+            _locals.Clear();
+
+            for (uint i = 0; i < funcNode.Prototype.Parameters.Count; i++)
             {
-                EmitFunction(funcNode);
+                var param = func.GetParam(i);
+                var paramNode = funcNode.Prototype.Parameters[(int)i];
+                var alloca = _builder.BuildAlloca(MapType(paramNode.Type), paramNode.NameToken.Value);
+                _builder.BuildStore(param, alloca);
+                _locals[paramNode.NameToken.Value] = alloca;
+            }
+
+            EmitBlock(funcNode.Body);
+
+            if (funcNode.Prototype.ReturnType is NubVoidType)
+            {
+                if (_builder.InsertBlock.Terminator.Handle == IntPtr.Zero)
+                {
+                    _builder.BuildRetVoid();
+                }
             }
         }
 
@@ -89,94 +139,16 @@ public class LlvmSharpGenerator
         _builder.Dispose();
     }
 
-    private void CreateFunctionDeclaration(FuncPrototypeNode prototype, string moduleName)
-    {
-        var funcName = FuncName(moduleName, prototype.NameToken.Value, prototype.ExternSymbolToken?.Value);
-
-        var paramTypes = prototype.Parameters.Select(p => MapType(p.Type)).ToArray();
-        var returnType = MapType(prototype.ReturnType);
-
-        var funcType = LLVMTypeRef.CreateFunction(returnType, paramTypes);
-        var func = _llvmModule.AddFunction(funcName, funcType);
-
-        func.FunctionCallConv = (uint)LLVMCallConv.LLVMCCallConv;
-
-        for (var i = 0; i < prototype.Parameters.Count; i++)
-        {
-            func.GetParam((uint)i).Name = prototype.Parameters[i].NameToken.Value;
-        }
-
-        _functions[funcName] = func;
-    }
-
-    private void EmitStructConstructor(StructNode structNode)
-    {
-        var structType = _structTypes[StructName(_module, structNode.NameToken.Value)];
-        var ptrType = LLVMTypeRef.CreatePointer(structType, 0);
-
-        var funcType = LLVMTypeRef.CreateFunction(LLVMTypeRef.Void, [ptrType]);
-        var funcName = StructConstructorName(_module, structNode.NameToken.Value);
-        var func = _llvmModule.AddFunction(funcName, funcType);
-        func.FunctionCallConv = (uint)LLVMCallConv.LLVMCCallConv;
-
-        var entryBlock = func.AppendBasicBlock("entry");
-        _builder.PositionAtEnd(entryBlock);
-
-        var selfParam = func.GetParam(0);
-        selfParam.Name = "self";
-
-        _locals.Clear();
-
-        foreach (var field in structNode.Fields)
-        {
-            if (field.Value != null)
-            {
-                var index = structNode.StructType.GetFieldIndex(field.NameToken.Value);
-                var fieldPtr = _builder.BuildStructGEP2(structType, selfParam, (uint)index);
-                EmitExpressionInto(field.Value, fieldPtr);
-            }
-        }
-
-        _builder.BuildRetVoid();
-        _functions[funcName] = func;
-    }
-
-    private void EmitFunction(FuncNode funcNode)
-    {
-        var funcName = FuncName(_module, funcNode.Prototype.NameToken.Value, funcNode.Prototype.ExternSymbolToken?.Value);
-        var func = _functions[funcName];
-
-        var entryBlock = func.AppendBasicBlock("entry");
-        _builder.PositionAtEnd(entryBlock);
-
-        _locals.Clear();
-
-        for (uint i = 0; i < funcNode.Prototype.Parameters.Count; i++)
-        {
-            var param = func.GetParam(i);
-            var paramNode = funcNode.Prototype.Parameters[(int)i];
-            var alloca = _builder.BuildAlloca(MapType(paramNode.Type), paramNode.NameToken.Value);
-            _builder.BuildStore(param, alloca);
-            _locals[paramNode.NameToken.Value] = alloca;
-        }
-
-        EmitBlock(funcNode.Body!);
-
-        if (funcNode.Prototype.ReturnType is NubVoidType)
-        {
-            if (_builder.InsertBlock.Terminator.Handle == IntPtr.Zero)
-            {
-                _builder.BuildRetVoid();
-            }
-        }
-    }
-
     private void EmitBlock(BlockNode blockNode)
     {
+        _scopes.Push(new Scope());
         foreach (var statement in blockNode.Statements)
         {
             EmitStatement(statement);
         }
+
+        EmitScopeExit();
+        _scopes.Pop();
     }
 
     private void EmitStatement(StatementNode statement)
@@ -195,6 +167,13 @@ public class LlvmSharpGenerator
             case ContinueNode:
                 EmitContinue();
                 break;
+            case DeferNode deferNode:
+                CurrentScope.DeferredActions.Push(() => EmitStatement(deferNode.Statement));
+                break;
+            case ForConstArrayNode forConstArrayNode:
+                throw new NotImplementedException();
+            case ForSliceNode forSliceNode:
+                throw new NotImplementedException();
             case IfNode ifNode:
                 EmitIf(ifNode);
                 break;
@@ -211,7 +190,7 @@ public class LlvmSharpGenerator
                 EmitWhile(whileNode);
                 break;
             default:
-                throw new NotImplementedException($"Statement type {statement.GetType()} not implemented");
+                throw new ArgumentOutOfRangeException(nameof(statement));
         }
     }
 
@@ -222,12 +201,14 @@ public class LlvmSharpGenerator
         _builder.BuildStore(value, targetPtr);
     }
 
+    // todo(nub31): Needs to call EmitScopeExit. However, the jump might span multiple scopes, so we must handle that
     private void EmitBreak()
     {
         var (breakBlock, _) = _loopStack.Peek();
         _builder.BuildBr(breakBlock);
     }
 
+    // todo(nub31): Needs to call EmitScopeExit. However, the jump might span multiple scopes, so we must handle that
     private void EmitContinue()
     {
         var (_, continueBlock) = _loopStack.Peek();
@@ -270,10 +251,12 @@ public class LlvmSharpGenerator
         if (returnNode.Value != null)
         {
             var value = EmitExpression(returnNode.Value);
+            EmitScopeExit();
             _builder.BuildRet(value);
         }
         else
         {
+            EmitScopeExit();
             _builder.BuildRetVoid();
         }
     }
@@ -512,7 +495,10 @@ public class LlvmSharpGenerator
     {
         var funcPtr = EmitExpression(funcCall.Expression);
         var args = funcCall.Parameters.Select(x => EmitExpression(x)).ToArray();
-        return _builder.BuildCall2(MapType(funcCall.Expression.Type), funcPtr, args, funcCall.Type is NubVoidType ? "" : "call");
+
+        var functionType = (NubFuncType)funcCall.Expression.Type;
+        var llvmFunctionType = LLVMTypeRef.CreateFunction(MapType(functionType.ReturnType), functionType.Parameters.Select(MapType).ToArray());
+        return _builder.BuildCall2(llvmFunctionType, funcPtr, args, funcCall.Type is NubVoidType ? "" : "call");
     }
 
     private LLVMValueRef EmitStructFieldAccess(StructFieldAccessNode field)
@@ -733,13 +719,14 @@ public class LlvmSharpGenerator
             NubBoolType => LLVMTypeRef.Int1,
             NubIntType intType => LLVMTypeRef.CreateInt((uint)intType.Width),
             NubFloatType floatType => floatType.Width == 32 ? LLVMTypeRef.Float : LLVMTypeRef.Double,
-            NubFuncType funcType => LLVMTypeRef.CreateFunction(MapType(funcType.ReturnType), funcType.Parameters.Select(MapType).ToArray()),
+            NubFuncType funcType => LLVMTypeRef.CreatePointer(LLVMTypeRef.CreateFunction(MapType(funcType.ReturnType), funcType.Parameters.Select(MapType).ToArray()), 0),
             NubPointerType ptrType => LLVMTypeRef.CreatePointer(MapType(ptrType.BaseType), 0),
             NubSliceType nubSliceType => MapSliceType(nubSliceType),
             NubStringType => _structTypes["nub.string"],
             NubArrayType arrType => LLVMTypeRef.CreatePointer(MapType(arrType.ElementType), 0),
             NubConstArrayType constArr => LLVMTypeRef.CreateArray(MapType(constArr.ElementType), (uint)constArr.Size),
             NubStructType structType => _structTypes[StructName(structType.Module, structType.Name)],
+            NubEnumType enumType => MapType(enumType.UnderlyingType),
             NubVoidType => LLVMTypeRef.Void,
             _ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
         };
@@ -778,4 +765,17 @@ public class LlvmSharpGenerator
 
         return $"{module}.{name}";
     }
+
+    private void EmitScopeExit()
+    {
+        while (CurrentScope.DeferredActions.TryPop(out var action))
+        {
+            action.Invoke();
+        }
+    }
+
+    private class Scope
+    {
+        public readonly Stack<Action> DeferredActions = [];
+    }
 }

compiler/NubLang/Modules/ModuleRepository.cs

@@ -11,7 +11,7 @@ public sealed class ModuleRepository
     public static ModuleRepository Create(List<SyntaxTree> syntaxTrees)
     {
         var structTypes = new Dictionary<(string module, string name), NubStructType>();
-        var enumTypes = new Dictionary<(string module, string name), NubIntType>();
+        var enumTypes = new Dictionary<(string module, string name), NubEnumType>();
 
         foreach (var syntaxTree in syntaxTrees)
         {
@@ -44,11 +44,27 @@ public sealed class ModuleRepository
                 underlyingType ??= new NubIntType(false, 64);
 
                 var key = (module.NameToken.Value, enumSyntax.NameToken.Value);
-                enumTypes.Add(key, underlyingType);
+
+                var memberValues = new Dictionary<string, ulong>();
+
+                ulong currentValue = 0;
+
+                foreach (var member in enumSyntax.Members)
+                {
+                    if (member.ValueToken != null)
+                    {
+                        currentValue = member.ValueToken.AsU64;
+                    }
+
+                    memberValues[member.NameToken.Value] = currentValue;
+                    currentValue++;
+                }
+
+                enumTypes.Add(key, new NubEnumType(module.NameToken.Value, enumSyntax.NameToken.Value, underlyingType, memberValues));
             }
         }
 
-        // note(nub31): Since all struct types are now registered, we can safely resolve the field types
+        // note(nub31): Since all struct and enum types are now registered, we can safely resolve the field types
         foreach (var syntaxTree in syntaxTrees)
         {
             var module = syntaxTree.TopLevelSyntaxNodes.OfType<ModuleSyntax>().FirstOrDefault();
@@ -90,9 +106,7 @@ public sealed class ModuleRepository
             {
                 Name = moduleDecl.NameToken.Value,
                 StructTypes = structTypes.Where(x => x.Key.module == moduleDecl.NameToken.Value).Select(x => x.Value).ToList(),
-                EnumTypes = enumTypes
+                EnumTypes = enumTypes.Where(x => x.Key.module == moduleDecl.NameToken.Value).Select(x => x.Value).ToList(),
-                    .Where(x => x.Key.module == moduleDecl.NameToken.Value)
-                    .ToDictionary(x => x.Key.name, x => x.Value),
                 FunctionPrototypes = functionPrototypes
             };
 
@@ -167,12 +181,6 @@ public sealed class ModuleRepository
         return module != null;
     }
 
-    public bool TryGet(string name, [NotNullWhen(true)] out Module? module)
-    {
-        module = _modules.GetValueOrDefault(name);
-        return module != null;
-    }
-
     public List<Module> GetAll()
     {
         return _modules.Values.ToList();
@@ -183,22 +191,7 @@ public sealed class ModuleRepository
         public required string Name { get; init; }
         public required List<FuncPrototypeNode> FunctionPrototypes { get; init; } = [];
         public required List<NubStructType> StructTypes { get; init; } = [];
-        public required Dictionary<string, NubIntType> EnumTypes { get; init; } = [];
+        public required List<NubEnumType> EnumTypes { get; init; } = [];
-
-        public bool TryResolveFunc(string name, [NotNullWhen(true)] out FuncPrototypeNode? value, [NotNullWhen(false)] out Diagnostic? diagnostic)
-        {
-            value = FunctionPrototypes.FirstOrDefault(x => x.NameToken.Value == name);
-
-            if (value == null)
-            {
-                value = null;
-                diagnostic = Diagnostic.Error($"Func {name} not found in module {Name}").Build();
-                return false;
-            }
-
-            diagnostic = null;
-            return true;
-        }
 
         public bool TryResolveFunc(IdentifierToken name, [NotNullWhen(true)] out FuncPrototypeNode? value, [NotNullWhen(false)] out Diagnostic? diagnostic)
         {
@@ -215,31 +208,6 @@ public sealed class ModuleRepository
             return true;
         }
 
-        public FuncPrototypeNode ResolveFunc(IdentifierToken name)
-        {
-            if (!TryResolveFunc(name, out var value, out var diagnostic))
-            {
-                throw new CompileException(diagnostic);
-            }
-
-            return value;
-        }
-
-        public bool TryResolveStruct(string name, [NotNullWhen(true)] out NubStructType? value, [NotNullWhen(false)] out Diagnostic? diagnostic)
-        {
-            value = StructTypes.FirstOrDefault(x => x.Name == name);
-
-            if (value == null)
-            {
-                value = null;
-                diagnostic = Diagnostic.Error($"Struct {name} not found in module {Name}").Build();
-                return false;
-            }
-
-            diagnostic = null;
-            return true;
-        }
-
         public bool TryResolveStruct(IdentifierToken name, [NotNullWhen(true)] out NubStructType? value, [NotNullWhen(false)] out Diagnostic? diagnostic)
         {
             value = StructTypes.FirstOrDefault(x => x.Name == name.Value);
@@ -255,34 +223,9 @@ public sealed class ModuleRepository
             return true;
         }
 
-        public NubStructType ResolveStruct(IdentifierToken name)
+        public bool TryResolveEnum(IdentifierToken name, [NotNullWhen(true)] out NubEnumType? value, [NotNullWhen(false)] out Diagnostic? diagnostic)
         {
-            if (!TryResolveStruct(name, out var value, out var diagnostic))
+            value = EnumTypes.FirstOrDefault(x => x.Name == name.Value);
-            {
-                throw new CompileException(diagnostic);
-            }
-
-            return value;
-        }
-
-        public bool TryResolveEnum(string name, [NotNullWhen(true)] out NubIntType? value, [NotNullWhen(false)] out Diagnostic? diagnostic)
-        {
-            value = EnumTypes.GetValueOrDefault(name);
-
-            if (value == null)
-            {
-                value = null;
-                diagnostic = Diagnostic.Error($"Enum {name} not found in module {Name}").Build();
-                return false;
-            }
-
-            diagnostic = null;
-            return true;
-        }
-
-        public bool TryResolveEnum(IdentifierToken name, [NotNullWhen(true)] out NubIntType? value, [NotNullWhen(false)] out Diagnostic? diagnostic)
-        {
-            value = EnumTypes.GetValueOrDefault(name.Value);
 
             if (value == null)
             {
@@ -294,15 +237,5 @@ public sealed class ModuleRepository
             diagnostic = null;
             return true;
         }
-
-        public NubIntType ResolveEnum(IdentifierToken name)
-        {
-            if (!TryResolveEnum(name, out var value, out var diagnostic))
-            {
-                throw new CompileException(diagnostic);
-            }
-
-            return value;
-        }
     }
 }

compiler/NubLang/Syntax/Parser.cs

@@ -174,7 +174,7 @@ public sealed class Parser
             type = ParseType();
         }
 
-        List<EnumFieldSyntax> fields = [];
+        List<EnumMemberSyntax> fields = [];
 
         ExpectSymbol(Symbol.OpenBrace);
 
@@ -197,7 +197,7 @@ public sealed class Parser
                 value = intLiteralToken;
             }
 
-            fields.Add(new EnumFieldSyntax(GetTokens(memberStartIndex), fieldName, value));
+            fields.Add(new EnumMemberSyntax(GetTokens(memberStartIndex), fieldName, value));
         }
 
         return new EnumSyntax(GetTokens(startIndex), name, exported, type, fields);

compiler/NubLang/Syntax/Syntax.cs

@@ -20,9 +20,9 @@ public record StructFieldSyntax(List<Token> Tokens, IdentifierToken NameToken, T
 
 public record StructSyntax(List<Token> Tokens, IdentifierToken NameToken, bool Exported, bool Packed, List<StructFieldSyntax> Fields) : DefinitionSyntax(Tokens, NameToken, Exported);
 
-public record EnumFieldSyntax(List<Token> Tokens, IdentifierToken NameToken, IntLiteralToken? ValueToken) : SyntaxNode(Tokens);
+public record EnumMemberSyntax(List<Token> Tokens, IdentifierToken NameToken, IntLiteralToken? ValueToken) : SyntaxNode(Tokens);
 
-public record EnumSyntax(List<Token> Tokens, IdentifierToken NameToken, bool Exported, TypeSyntax? Type, List<EnumFieldSyntax> Fields) : DefinitionSyntax(Tokens, NameToken, Exported);
+public record EnumSyntax(List<Token> Tokens, IdentifierToken NameToken, bool Exported, TypeSyntax? Type, List<EnumMemberSyntax> Members) : DefinitionSyntax(Tokens, NameToken, Exported);
 
 public enum UnaryOperatorSyntax
 {

compiler/NubLang/Types/NubType.cs

@@ -183,6 +183,22 @@ public class NubStructFieldType(string name, NubType type, bool hasDefaultValue)
     public bool HasDefaultValue { get; } = hasDefaultValue;
 }
 
+public class NubEnumType(string module, string name, NubIntType underlyingType, Dictionary<string, ulong> members) : NubType
+{
+    public string Module { get; } = module;
+    public string Name { get; } = name;
+    public NubIntType UnderlyingType { get; } = underlyingType;
+    public Dictionary<string, ulong> Members { get; } = members;
+
+    public override ulong GetSize() => UnderlyingType.GetSize();
+    public override ulong GetAlignment() => UnderlyingType.GetSize();
+    public override bool IsAggregate() => false;
+
+    public override bool Equals(NubType? other) => other is NubEnumType enumType && Name == enumType.Name && Module == enumType.Module;
+    public override int GetHashCode() => HashCode.Combine(typeof(NubEnumType), Module, Name);
+    public override string ToString() => $"{Module}::{Name}";
+}
+
 public class NubSliceType(NubType elementType) : NubType
 {
     public NubType ElementType { get; } = elementType;

examples/playgroud/main.nub

@@ -8,7 +8,6 @@ struct Test {
 
 extern "main" func main(argc: i64, argv: [?]^i8)
 {
-    let x = "test"
+    let x: Test = {}
-
+    puts(x.test)
-    puts(x)
 }

examples/raylib/build.sh

@@ -2,5 +2,5 @@
 
 set -euo pipefail
 
-obj=$(nubc main.nub generated/raylib.nub)
+nubc main.nub generated/raylib.nub
-clang $obj raylib-5.5_linux_amd64/lib/libraylib.a -lm -o .build/out
+clang .build/main.ll .build/generated/raylib.ll raylib-5.5_linux_amd64/lib/libraylib.a -lm -o .build/out

examples/raylib/generated/raylib.nub

@@ -288,36 +288,6 @@ export enum ConfigFlags : u32
     FLAG_MSAA_4X_HINT = 32
     FLAG_INTERLACED_HINT = 65536
 }
-export enum ConfigFlags : u32
-{
-    FLAG_VSYNC_HINT = 64
-    FLAG_FULLSCREEN_MODE = 2
-    FLAG_WINDOW_RESIZABLE = 4
-    FLAG_WINDOW_UNDECORATED = 8
-    FLAG_WINDOW_HIDDEN = 128
-    FLAG_WINDOW_MINIMIZED = 512
-    FLAG_WINDOW_MAXIMIZED = 1024
-    FLAG_WINDOW_UNFOCUSED = 2048
-    FLAG_WINDOW_TOPMOST = 4096
-    FLAG_WINDOW_ALWAYS_RUN = 256
-    FLAG_WINDOW_TRANSPARENT = 16
-    FLAG_WINDOW_HIGHDPI = 8192
-    FLAG_WINDOW_MOUSE_PASSTHROUGH = 16384
-    FLAG_BORDERLESS_WINDOWED_MODE = 32768
-    FLAG_MSAA_4X_HINT = 32
-    FLAG_INTERLACED_HINT = 65536
-}
-export enum TraceLogLevel : u32
-{
-    LOG_ALL = 0
-    LOG_TRACE = 1
-    LOG_DEBUG = 2
-    LOG_INFO = 3
-    LOG_WARNING = 4
-    LOG_ERROR = 5
-    LOG_FATAL = 6
-    LOG_NONE = 7
-}
 export enum TraceLogLevel : u32
 {
     LOG_ALL = 0
@@ -442,119 +412,6 @@ export enum KeyboardKey : u32
     KEY_VOLUME_UP = 24
     KEY_VOLUME_DOWN = 25
 }
-export enum KeyboardKey : u32
-{
-    KEY_NULL = 0
-    KEY_APOSTROPHE = 39
-    KEY_COMMA = 44
-    KEY_MINUS = 45
-    KEY_PERIOD = 46
-    KEY_SLASH = 47
-    KEY_ZERO = 48
-    KEY_ONE = 49
-    KEY_TWO = 50
-    KEY_THREE = 51
-    KEY_FOUR = 52
-    KEY_FIVE = 53
-    KEY_SIX = 54
-    KEY_SEVEN = 55
-    KEY_EIGHT = 56
-    KEY_NINE = 57
-    KEY_SEMICOLON = 59
-    KEY_EQUAL = 61
-    KEY_A = 65
-    KEY_B = 66
-    KEY_C = 67
-    KEY_D = 68
-    KEY_E = 69
-    KEY_F = 70
-    KEY_G = 71
-    KEY_H = 72
-    KEY_I = 73
-    KEY_J = 74
-    KEY_K = 75
-    KEY_L = 76
-    KEY_M = 77
-    KEY_N = 78
-    KEY_O = 79
-    KEY_P = 80
-    KEY_Q = 81
-    KEY_R = 82
-    KEY_S = 83
-    KEY_T = 84
-    KEY_U = 85
-    KEY_V = 86
-    KEY_W = 87
-    KEY_X = 88
-    KEY_Y = 89
-    KEY_Z = 90
-    KEY_LEFT_BRACKET = 91
-    KEY_BACKSLASH = 92
-    KEY_RIGHT_BRACKET = 93
-    KEY_GRAVE = 96
-    KEY_SPACE = 32
-    KEY_ESCAPE = 256
-    KEY_ENTER = 257
-    KEY_TAB = 258
-    KEY_BACKSPACE = 259
-    KEY_INSERT = 260
-    KEY_DELETE = 261
-    KEY_RIGHT = 262
-    KEY_LEFT = 263
-    KEY_DOWN = 264
-    KEY_UP = 265
-    KEY_PAGE_UP = 266
-    KEY_PAGE_DOWN = 267
-    KEY_HOME = 268
-    KEY_END = 269
-    KEY_CAPS_LOCK = 280
-    KEY_SCROLL_LOCK = 281
-    KEY_NUM_LOCK = 282
-    KEY_PRINT_SCREEN = 283
-    KEY_PAUSE = 284
-    KEY_F1 = 290
-    KEY_F2 = 291
-    KEY_F3 = 292
-    KEY_F4 = 293
-    KEY_F5 = 294
-    KEY_F6 = 295
-    KEY_F7 = 296
-    KEY_F8 = 297
-    KEY_F9 = 298
-    KEY_F10 = 299
-    KEY_F11 = 300
-    KEY_F12 = 301
-    KEY_LEFT_SHIFT = 340
-    KEY_LEFT_CONTROL = 341
-    KEY_LEFT_ALT = 342
-    KEY_LEFT_SUPER = 343
-    KEY_RIGHT_SHIFT = 344
-    KEY_RIGHT_CONTROL = 345
-    KEY_RIGHT_ALT = 346
-    KEY_RIGHT_SUPER = 347
-    KEY_KB_MENU = 348
-    KEY_KP_0 = 320
-    KEY_KP_1 = 321
-    KEY_KP_2 = 322
-    KEY_KP_3 = 323
-    KEY_KP_4 = 324
-    KEY_KP_5 = 325
-    KEY_KP_6 = 326
-    KEY_KP_7 = 327
-    KEY_KP_8 = 328
-    KEY_KP_9 = 329
-    KEY_KP_DECIMAL = 330
-    KEY_KP_DIVIDE = 331
-    KEY_KP_MULTIPLY = 332
-    KEY_KP_SUBTRACT = 333
-    KEY_KP_ADD = 334
-    KEY_KP_ENTER = 335
-    KEY_KP_EQUAL = 336
-    KEY_BACK = 4
-    KEY_MENU = 5
-    KEY_VOLUME_UP = 24
-    KEY_VOLUME_DOWN = 25
-}
 export enum MouseButton : u32
 {
     MOUSE_BUTTON_LEFT = 0
@@ -565,30 +422,6 @@ export enum MouseButton : u32
     MOUSE_BUTTON_FORWARD = 5
     MOUSE_BUTTON_BACK = 6
 }
-export enum MouseButton : u32
-{
-    MOUSE_BUTTON_LEFT = 0
-    MOUSE_BUTTON_RIGHT = 1
-    MOUSE_BUTTON_MIDDLE = 2
-    MOUSE_BUTTON_SIDE = 3
-    MOUSE_BUTTON_EXTRA = 4
-    MOUSE_BUTTON_FORWARD = 5
-    MOUSE_BUTTON_BACK = 6
-}
-export enum MouseCursor : u32
-{
-    MOUSE_CURSOR_DEFAULT = 0
-    MOUSE_CURSOR_ARROW = 1
-    MOUSE_CURSOR_IBEAM = 2
-    MOUSE_CURSOR_CROSSHAIR = 3
-    MOUSE_CURSOR_POINTING_HAND = 4
-    MOUSE_CURSOR_RESIZE_EW = 5
-    MOUSE_CURSOR_RESIZE_NS = 6
-    MOUSE_CURSOR_RESIZE_NWSE = 7
-    MOUSE_CURSOR_RESIZE_NESW = 8
-    MOUSE_CURSOR_RESIZE_ALL = 9
-    MOUSE_CURSOR_NOT_ALLOWED = 10
-}
 export enum MouseCursor : u32
 {
     MOUSE_CURSOR_DEFAULT = 0
@@ -624,27 +457,6 @@ export enum GamepadButton : u32
     GAMEPAD_BUTTON_LEFT_THUMB = 16
     GAMEPAD_BUTTON_RIGHT_THUMB = 17
 }
-export enum GamepadButton : u32
-{
-    GAMEPAD_BUTTON_UNKNOWN = 0
-    GAMEPAD_BUTTON_LEFT_FACE_UP = 1
-    GAMEPAD_BUTTON_LEFT_FACE_RIGHT = 2
-    GAMEPAD_BUTTON_LEFT_FACE_DOWN = 3
-    GAMEPAD_BUTTON_LEFT_FACE_LEFT = 4
-    GAMEPAD_BUTTON_RIGHT_FACE_UP = 5
-    GAMEPAD_BUTTON_RIGHT_FACE_RIGHT = 6
-    GAMEPAD_BUTTON_RIGHT_FACE_DOWN = 7
-    GAMEPAD_BUTTON_RIGHT_FACE_LEFT = 8
-    GAMEPAD_BUTTON_LEFT_TRIGGER_1 = 9
-    GAMEPAD_BUTTON_LEFT_TRIGGER_2 = 10
-    GAMEPAD_BUTTON_RIGHT_TRIGGER_1 = 11
-    GAMEPAD_BUTTON_RIGHT_TRIGGER_2 = 12
-    GAMEPAD_BUTTON_MIDDLE_LEFT = 13
-    GAMEPAD_BUTTON_MIDDLE = 14
-    GAMEPAD_BUTTON_MIDDLE_RIGHT = 15
-    GAMEPAD_BUTTON_LEFT_THUMB = 16
-    GAMEPAD_BUTTON_RIGHT_THUMB = 17
-}
 export enum GamepadAxis : u32
 {
     GAMEPAD_AXIS_LEFT_X = 0
@@ -654,29 +466,6 @@ export enum GamepadAxis : u32
     GAMEPAD_AXIS_LEFT_TRIGGER = 4
     GAMEPAD_AXIS_RIGHT_TRIGGER = 5
 }
-export enum GamepadAxis : u32
-{
-    GAMEPAD_AXIS_LEFT_X = 0
-    GAMEPAD_AXIS_LEFT_Y = 1
-    GAMEPAD_AXIS_RIGHT_X = 2
-    GAMEPAD_AXIS_RIGHT_Y = 3
-    GAMEPAD_AXIS_LEFT_TRIGGER = 4
-    GAMEPAD_AXIS_RIGHT_TRIGGER = 5
-}
-export enum MaterialMapIndex : u32
-{
-    MATERIAL_MAP_ALBEDO = 0
-    MATERIAL_MAP_METALNESS = 1
-    MATERIAL_MAP_NORMAL = 2
-    MATERIAL_MAP_ROUGHNESS = 3
-    MATERIAL_MAP_OCCLUSION = 4
-    MATERIAL_MAP_EMISSION = 5
-    MATERIAL_MAP_HEIGHT = 6
-    MATERIAL_MAP_CUBEMAP = 7
-    MATERIAL_MAP_IRRADIANCE = 8
-    MATERIAL_MAP_PREFILTER = 9
-    MATERIAL_MAP_BRDF = 10
-}
 export enum MaterialMapIndex : u32
 {
     MATERIAL_MAP_ALBEDO = 0
@@ -723,50 +512,6 @@ export enum ShaderLocationIndex : u32
     SHADER_LOC_VERTEX_BONEWEIGHTS = 27
     SHADER_LOC_BONE_MATRICES = 28
 }
-export enum ShaderLocationIndex : u32
-{
-    SHADER_LOC_VERTEX_POSITION = 0
-    SHADER_LOC_VERTEX_TEXCOORD01 = 1
-    SHADER_LOC_VERTEX_TEXCOORD02 = 2
-    SHADER_LOC_VERTEX_NORMAL = 3
-    SHADER_LOC_VERTEX_TANGENT = 4
-    SHADER_LOC_VERTEX_COLOR = 5
-    SHADER_LOC_MATRIX_MVP = 6
-    SHADER_LOC_MATRIX_VIEW = 7
-    SHADER_LOC_MATRIX_PROJECTION = 8
-    SHADER_LOC_MATRIX_MODEL = 9
-    SHADER_LOC_MATRIX_NORMAL = 10
-    SHADER_LOC_VECTOR_VIEW = 11
-    SHADER_LOC_COLOR_DIFFUSE = 12
-    SHADER_LOC_COLOR_SPECULAR = 13
-    SHADER_LOC_COLOR_AMBIENT = 14
-    SHADER_LOC_MAP_ALBEDO = 15
-    SHADER_LOC_MAP_METALNESS = 16
-    SHADER_LOC_MAP_NORMAL = 17
-    SHADER_LOC_MAP_ROUGHNESS = 18
-    SHADER_LOC_MAP_OCCLUSION = 19
-    SHADER_LOC_MAP_EMISSION = 20
-    SHADER_LOC_MAP_HEIGHT = 21
-    SHADER_LOC_MAP_CUBEMAP = 22
-    SHADER_LOC_MAP_IRRADIANCE = 23
-    SHADER_LOC_MAP_PREFILTER = 24
-    SHADER_LOC_MAP_BRDF = 25
-    SHADER_LOC_VERTEX_BONEIDS = 26
-    SHADER_LOC_VERTEX_BONEWEIGHTS = 27
-    SHADER_LOC_BONE_MATRICES = 28
-}
-export enum ShaderUniformDataType : u32
-{
-    SHADER_UNIFORM_FLOAT = 0
-    SHADER_UNIFORM_VEC2 = 1
-    SHADER_UNIFORM_VEC3 = 2
-    SHADER_UNIFORM_VEC4 = 3
-    SHADER_UNIFORM_INT = 4
-    SHADER_UNIFORM_IVEC2 = 5
-    SHADER_UNIFORM_IVEC3 = 6
-    SHADER_UNIFORM_IVEC4 = 7
-    SHADER_UNIFORM_SAMPLER2D = 8
-}
 export enum ShaderUniformDataType : u32
 {
     SHADER_UNIFORM_FLOAT = 0
@@ -786,40 +531,6 @@ export enum ShaderAttributeDataType : u32
     SHADER_ATTRIB_VEC3 = 2
     SHADER_ATTRIB_VEC4 = 3
 }
-export enum ShaderAttributeDataType : u32
-{
-    SHADER_ATTRIB_FLOAT = 0
-    SHADER_ATTRIB_VEC2 = 1
-    SHADER_ATTRIB_VEC3 = 2
-    SHADER_ATTRIB_VEC4 = 3
-}
-export enum PixelFormat : u32
-{
-    PIXELFORMAT_UNCOMPRESSED_GRAYSCALE = 1
-    PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA = 2
-    PIXELFORMAT_UNCOMPRESSED_R5G6B5 = 3
-    PIXELFORMAT_UNCOMPRESSED_R8G8B8 = 4
-    PIXELFORMAT_UNCOMPRESSED_R5G5B5A1 = 5
-    PIXELFORMAT_UNCOMPRESSED_R4G4B4A4 = 6
-    PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 = 7
-    PIXELFORMAT_UNCOMPRESSED_R32 = 8
-    PIXELFORMAT_UNCOMPRESSED_R32G32B32 = 9
-    PIXELFORMAT_UNCOMPRESSED_R32G32B32A32 = 10
-    PIXELFORMAT_UNCOMPRESSED_R16 = 11
-    PIXELFORMAT_UNCOMPRESSED_R16G16B16 = 12
-    PIXELFORMAT_UNCOMPRESSED_R16G16B16A16 = 13
-    PIXELFORMAT_COMPRESSED_DXT1_RGB = 14
-    PIXELFORMAT_COMPRESSED_DXT1_RGBA = 15
-    PIXELFORMAT_COMPRESSED_DXT3_RGBA = 16
-    PIXELFORMAT_COMPRESSED_DXT5_RGBA = 17
-    PIXELFORMAT_COMPRESSED_ETC1_RGB = 18
-    PIXELFORMAT_COMPRESSED_ETC2_RGB = 19
-    PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA = 20
-    PIXELFORMAT_COMPRESSED_PVRT_RGB = 21
-    PIXELFORMAT_COMPRESSED_PVRT_RGBA = 22
-    PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA = 23
-    PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA = 24
-}
 export enum PixelFormat : u32
 {
     PIXELFORMAT_UNCOMPRESSED_GRAYSCALE = 1
@@ -856,22 +567,6 @@ export enum TextureFilter : u32
     TEXTURE_FILTER_ANISOTROPIC_8X = 4
     TEXTURE_FILTER_ANISOTROPIC_16X = 5
 }
-export enum TextureFilter : u32
-{
-    TEXTURE_FILTER_POINT = 0
-    TEXTURE_FILTER_BILINEAR = 1
-    TEXTURE_FILTER_TRILINEAR = 2
-    TEXTURE_FILTER_ANISOTROPIC_4X = 3
-    TEXTURE_FILTER_ANISOTROPIC_8X = 4
-    TEXTURE_FILTER_ANISOTROPIC_16X = 5
-}
-export enum TextureWrap : u32
-{
-    TEXTURE_WRAP_REPEAT = 0
-    TEXTURE_WRAP_CLAMP = 1
-    TEXTURE_WRAP_MIRROR_REPEAT = 2
-    TEXTURE_WRAP_MIRROR_CLAMP = 3
-}
 export enum TextureWrap : u32
 {
     TEXTURE_WRAP_REPEAT = 0
@@ -887,37 +582,12 @@ export enum CubemapLayout : u32
     CUBEMAP_LAYOUT_CROSS_THREE_BY_FOUR = 3
     CUBEMAP_LAYOUT_CROSS_FOUR_BY_THREE = 4
 }
-export enum CubemapLayout : u32
-{
-    CUBEMAP_LAYOUT_AUTO_DETECT = 0
-    CUBEMAP_LAYOUT_LINE_VERTICAL = 1
-    CUBEMAP_LAYOUT_LINE_HORIZONTAL = 2
-    CUBEMAP_LAYOUT_CROSS_THREE_BY_FOUR = 3
-    CUBEMAP_LAYOUT_CROSS_FOUR_BY_THREE = 4
-}
 export enum FontType : u32
 {
     FONT_DEFAULT = 0
     FONT_BITMAP = 1
     FONT_SDF = 2
 }
-export enum FontType : u32
-{
-    FONT_DEFAULT = 0
-    FONT_BITMAP = 1
-    FONT_SDF = 2
-}
-export enum BlendMode : u32
-{
-    BLEND_ALPHA = 0
-    BLEND_ADDITIVE = 1
-    BLEND_MULTIPLIED = 2
-    BLEND_ADD_COLORS = 3
-    BLEND_SUBTRACT_COLORS = 4
-    BLEND_ALPHA_PREMULTIPLY = 5
-    BLEND_CUSTOM = 6
-    BLEND_CUSTOM_SEPARATE = 7
-}
 export enum BlendMode : u32
 {
     BLEND_ALPHA = 0
@@ -943,28 +613,6 @@ export enum Gesture : u32
     GESTURE_PINCH_IN = 256
     GESTURE_PINCH_OUT = 512
 }
-export enum Gesture : u32
-{
-    GESTURE_NONE = 0
-    GESTURE_TAP = 1
-    GESTURE_DOUBLETAP = 2
-    GESTURE_HOLD = 4
-    GESTURE_DRAG = 8
-    GESTURE_SWIPE_RIGHT = 16
-    GESTURE_SWIPE_LEFT = 32
-    GESTURE_SWIPE_UP = 64
-    GESTURE_SWIPE_DOWN = 128
-    GESTURE_PINCH_IN = 256
-    GESTURE_PINCH_OUT = 512
-}
-export enum CameraMode : u32
-{
-    CAMERA_CUSTOM = 0
-    CAMERA_FREE = 1
-    CAMERA_ORBITAL = 2
-    CAMERA_FIRST_PERSON = 3
-    CAMERA_THIRD_PERSON = 4
-}
 export enum CameraMode : u32
 {
     CAMERA_CUSTOM = 0
@@ -978,17 +626,6 @@ export enum CameraProjection : u32
     CAMERA_PERSPECTIVE = 0
     CAMERA_ORTHOGRAPHIC = 1
 }
-export enum CameraProjection : u32
-{
-    CAMERA_PERSPECTIVE = 0
-    CAMERA_ORTHOGRAPHIC = 1
-}
-export enum NPatchLayout : u32
-{
-    NPATCH_NINE_PATCH = 0
-    NPATCH_THREE_PATCH_VERTICAL = 1
-    NPATCH_THREE_PATCH_HORIZONTAL = 2
-}
 export enum NPatchLayout : u32
 {
     NPATCH_NINE_PATCH = 0