...

compiler/Generator.cs

@@ -17,11 +17,119 @@ public class Generator
         this.entryPoint = entryPoint;
     }
 
+    const string NUB_H_CONTENTS =
+    """
+    #include <stdint.h>
+    #include <stdlib.h>
+    #include <string.h>
+    #include <stdio.h>
+
+    static inline void *nub_alloc(size_t size)
+    {
+        void *mem = malloc(size);
+        if (mem == NULL)
+        {
+            puts("Out of memory");
+            exit(1);
+        }
+
+        return mem;
+    }
+
+    typedef struct
+    {
+        char *data;
+        size_t length;
+        size_t ref;
+        uint32_t flags;
+    } string;
+
+    typedef string *string_ptr;
+
+    #define FLAG_STRING_LITERAL 1
+
+    static inline void string_rc_inc(string_ptr str)
+    {
+        if (str == NULL)
+            return;
+
+        if (str->flags & FLAG_STRING_LITERAL)
+            return;
+
+        str->ref += 1;
+    }
+
+    static inline void string_rc_dec(string_ptr str)
+    {
+        if (str == NULL)
+            return;
+
+        if (str->flags & FLAG_STRING_LITERAL)
+            return;
+
+        if (str->ref == 0)
+            return;
+
+        str->ref -= 1;
+
+        if (str->ref == 0)
+        {
+            free(str->data);
+            free(str);
+        }
+    }
+
+    static inline string_ptr string_concat(string_ptr left, string_ptr right)
+    {
+        size_t new_length = left->length + right->length;
+
+        string_ptr result = (string_ptr)nub_alloc(sizeof(string));
+        result->data = (char*)nub_alloc(new_length + 1);
+
+        memcpy(result->data, left->data, left->length);
+        memcpy(result->data + left->length, right->data, right->length);
+
+        result->data[new_length] = '\0';
+        result->length = new_length;
+        result->ref = 1;
+        result->flags = 0;
+
+        return result;
+    }
+
+    static inline string_ptr string_from_cstr(char *cstr)
+    {
+        size_t len = strlen(cstr);
+
+        string_ptr result = (string_ptr)nub_alloc(sizeof(string));
+        result->data = (char*)nub_alloc(len + 1);
+
+        memcpy(result->data, cstr, len + 1);
+
+        result->length = len;
+        result->ref = 1;
+        result->flags = 0;
+
+        return result;
+    }
+
+    #define da_append(xs, x)                                                               \
+        do                                                                                 \
+        {                                                                                  \
+            if ((xs)->count >= (xs)->capacity)                                             \
+            {                                                                              \
+                (xs)->capacity *= 2;                                                       \
+                (xs)->items = realloc((xs)->items, (xs)->capacity * sizeof(*(xs)->items)); \
+            }                                                                              \
+            (xs)->items[(xs)->count++] = (x);                                              \
+        } while (0)
+
+    """;
+
     private readonly List<TypedNodeDefinitionFunc> functions;
     private readonly ModuleGraph moduleGraph;
     private readonly string? entryPoint;
     private IndentedTextWriter writer = new();
-    private readonly HashSet<NubType> referencedTypes = [];
     private readonly Dictionary<string, string> referencedStringLiterals = [];
     private readonly HashSet<NubType> emittedTypes = [];
     private readonly Stack<Scope> scopes = new();
@@ -29,16 +137,18 @@ public class Generator
 
     private string Emit()
     {
+        var outPath = ".build";
+        var fileName = "out.c";
+
         if (entryPoint != null)
         {
-            writer.WriteLine($$"""
+            writer.WriteLine("int main(int argc, char *argv[])");
-                             int main(int argc, char *argv[])
+            writer.WriteLine("{");
-                             {
+            using (writer.Indent())
-                                return {{entryPoint}}();
+            {
-                             }
+                writer.WriteLine($"return {entryPoint}();");
-
+            }
-                             """);
+            writer.WriteLine("}");
-
             writer.WriteLine();
         }
 
@@ -47,14 +157,12 @@ public class Generator
             if (!moduleGraph.TryResolveIdentifier(function.Module, function.Name.Ident, true, out var info))
                 throw new UnreachableException($"Module graph does not have info about the function {function.Module}::{function.Name.Ident}. This should have been caught earlier");
 
-            if (info.Source == Module.DefinitionSource.Imported || info.Extern)
+            if (info.Source == Module.DefinitionSource.Internal && !info.Extern && !info.Exported)
-                writer.Write("extern ");
-            else if (info.Source == Module.DefinitionSource.Internal && !info.Extern && !info.Exported)
                 writer.Write("static ");
 
-            var parameters = function.Parameters.Select(x => CType(x.Type, x.Name.Ident));
+            var parameters = function.Parameters.Select(x => $"{TypeName(x.Type)} {x.Name.Ident}");
 
-            writer.WriteLine($"{CType(function.ReturnType, info.MangledName)}({string.Join(", ", parameters)})");
+            writer.WriteLine($"{TypeName(function.ReturnType)} {info.MangledName}({string.Join(", ", parameters)})");
             writer.WriteLine("{");
             using (writer.Indent())
             {
@@ -66,7 +174,7 @@ public class Generator
             writer.WriteLine();
         }
 
-        var implementations = writer.ToString();
+        var definitions = writer.ToString();
 
         writer = new IndentedTextWriter();
 
@@ -82,166 +190,15 @@ public class Generator
                         writer.Write("static ");
 
                     if (info.Type is NubTypeFunc fn)
-                        writer.WriteLine($"{CType(fn.ReturnType, info.MangledName)}({string.Join(", ", fn.Parameters.Select(p => CType(p)))});");
+                        writer.WriteLine($"{TypeName(fn.ReturnType)} {info.MangledName}({string.Join(", ", fn.Parameters.Select(TypeName))});");
                     else
-                        writer.WriteLine($"{CType(info.Type, info.MangledName)};");
+                        writer.WriteLine($"{TypeName(info.Type)} {info.MangledName};");
+
+                    writer.WriteLine();
                 }
             }
         }
 
-        var declarations = writer.ToString();
-
-        writer = new IndentedTextWriter();
-
-        writer.WriteLine("""
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-typedef struct
-{
-  char *data;
-  size_t length;
-  uint32_t ref;
-  uint32_t flags;
-} string;
-
-typedef uint8_t u8;
-typedef int8_t i8;
-
-typedef uint16_t u16;
-typedef int16_t i16;
-
-typedef uint32_t u32;
-typedef int32_t i32;
-
-typedef uint64_t u64;
-typedef int64_t i64;
-
-#define FLAG_STRING_LITERAL 1
-
-#define RC_DBG(fmt, ...) fprintf(stderr, "[RC] " fmt "\n", ##__VA_ARGS__)
-
-static size_t rc_allocs = 0;
-static size_t rc_frees = 0;
-
-__attribute__((destructor))
-static void string_debug_report(void)
-{
-  fprintf(stderr, "[RC] REPORT allocs=%zu frees=%zu leaks=%zu\n", rc_allocs, rc_frees, rc_allocs - rc_frees);
-}
-
-static inline void string_rc_inc(string *str)
-{
-  if (str == NULL)
-  {
-    RC_DBG("INC null string");
-    return;
-  }
-
-  if (str->flags & FLAG_STRING_LITERAL)
-    return;
-
-  str->ref += 1;
-
-  RC_DBG("INC: str=%p ref=%u \"%s\"", (void *)str, str->ref, str->data);
-}
-
-static inline void string_rc_dec(string *str)
-{
-  if (str == NULL)
-  {
-    RC_DBG("WRN: DEC null string");
-    return;
-  }
-
-  if (str->flags & FLAG_STRING_LITERAL)
-    return;
-
-  if (str->ref == 0)
-  {
-    RC_DBG("ERR: DEC on zero refcount str=%p", (void *)str);
-    return;
-  }
-
-  str->ref -= 1;
-
-  RC_DBG("DEC: str=%p ref=%u \"%s\"", (void *)str, str->ref, str->data);
-
-  if (str->ref == 0)
-  {
-    rc_frees++;
-    RC_DBG("FREE: str=%p data=%p \"%s\"", (void *)str, (void *)str->data, str->data);
-
-    free(str->data);
-    free(str);
-  }
-}
-
-static inline string *string_concat(string *left, string *right)
-{
-  size_t new_length = left->length + right->length;
-
-  string *result = (string *)malloc(sizeof(string));
-  result->data = (char *)malloc(new_length + 1);
-
-  memcpy(result->data, left->data, left->length);
-  memcpy(result->data + left->length, right->data, right->length);
-
-  result->data[new_length] = '\0';
-  result->length = new_length;
-  result->ref = 1;
-  result->flags = 0;
-
-  rc_allocs++;
-  RC_DBG("NEW string_concat: str=%p ref=%u \"%s\"", (void *)result, result->ref, result->data);
-
-  return result;
-}
-
-static inline string *string_from_cstr(char *cstr)
-{
-  size_t len = strlen(cstr);
-
-  string *result = (string *)malloc(sizeof(string));
-  result->data = (char *)malloc(len + 1);
-
-  memcpy(result->data, cstr, len + 1);
-
-  result->length = len;
-  result->ref = 1;
-  result->flags = 0;
-
-  rc_allocs++;
-  RC_DBG("NEW string_from_cstr: str=%p ref=%u \"%s\"", (void *)result, result->ref, result->data);
-
-  return result;
-}
-
-#define da_append(xs, x)                                                             \
-    do                                                                               \
-    {                                                                                \
-        if ((xs)->count >= (xs)->capacity)                                           \
-        {                                                                            \
-            if ((xs)->capacity == 0) (xs)->capacity = 256;                           \
-            else (xs)->capacity *= 2;                                                \
-            (xs)->items = realloc((xs)->items, (xs)->capacity*sizeof(*(xs)->items)); \
-        }                                                                            \
-                                                                                     \
-        (xs)->items[(xs)->count++] = (x);                                            \
-    }                                                                                \
-    while (0)
-
-""");
-
-        while (referencedTypes.Count != 0)
-        {
-            var type = referencedTypes.ElementAt(0);
-            EmitTypeDefinitionIfNotEmitted(type);
-            referencedTypes.Remove(type);
-        }
-
         foreach (var (name, value) in referencedStringLiterals)
         {
             writer.WriteLine
@@ -258,9 +215,38 @@ static inline string *string_from_cstr(char *cstr)
             );
         }
 
-        var header = writer.ToString();
+        var declarations = writer.ToString();
 
-        return $"{header}\n{declarations}\n{implementations}";
+        writer = new IndentedTextWriter();
+
+
+        while (emittedTypes.Count != typeNames.Count)
+        {
+            var nextTypes = typeNames.Keys.ToArray();
+            foreach (var type in nextTypes)
+            {
+                EmitTypeDefinitionIfNotEmitted(type);
+            }
+        }
+
+        var types = writer.ToString();
+
+        var sb = new StringBuilder();
+
+        sb.AppendLine("#include \"nub.h\"");
+        sb.AppendLine();
+        sb.AppendLine(types);
+        sb.AppendLine(declarations);
+        sb.AppendLine(definitions);
+
+        Directory.CreateDirectory(outPath);
+
+        var filePath = Path.Combine(outPath, fileName);
+
+        File.WriteAllText(Path.Combine(outPath, "nub.h"), NUB_H_CONTENTS);
+        File.WriteAllText(filePath, sb.ToString());
+
+        return filePath;
     }
 
     private void EmitTypeDefinitionIfNotEmitted(NubType type)
@@ -270,109 +256,10 @@ static inline string *string_from_cstr(char *cstr)
 
         emittedTypes.Add(type);
 
+        var name = TypeName(type);
+
         switch (type)
         {
-            case NubTypeArray arrayType:
-                {
-                    EmitTypeDefinitionIfNotEmitted(arrayType.ElementType);
-
-                    var name = typeNames[arrayType];
-
-                    writer.WriteLine("typedef struct");
-                    writer.WriteLine("{");
-                    using (writer.Indent())
-                    {
-                        writer.WriteLine("size_t count;");
-                        writer.WriteLine("size_t capacity;");
-                        writer.WriteLine($"{CType(arrayType.ElementType)} *items;");
-                        writer.WriteLine("uint32_t ref;");
-                    }
-                    writer.WriteLine($"}} {name};");
-                    writer.WriteLine();
-
-                    writer.WriteLine($$"""
-static inline void {{name}}_rc_inc({{name}} *array)
-{
-  if (array == NULL)
-  {
-    RC_DBG("WRN: INC null array");
-    return;
-  }
-
-  array->ref += 1;
-
-  RC_DBG("INC: array=%p ref=%u", (void *)array, array->ref);
-}
-
-""");
-
-                    writer.WriteLine($"static inline void {name}_rc_dec({name} *array)");
-                    writer.WriteLine("{");
-                    using (writer.Indent())
-                    {
-                        writer.WriteLine("if (array == NULL)");
-                        writer.WriteLine("{");
-                        using (writer.Indent())
-                        {
-                            writer.WriteLine("RC_DBG(\"WRN: DEC null array\");");
-                            writer.WriteLine("return;");
-                        }
-                        writer.WriteLine("}");
-                        writer.WriteLine();
-                        writer.WriteLine("if (array->ref == 0)");
-                        writer.WriteLine("{");
-                        using (writer.Indent())
-                        {
-                            writer.WriteLine("RC_DBG(\"ERR: DEC on zero refcount\");");
-                            writer.WriteLine("return;");
-                        }
-                        writer.WriteLine("}");
-                        writer.WriteLine();
-                        writer.WriteLine("array->ref -= 1;");
-                        writer.WriteLine();
-                        writer.WriteLine("RC_DBG(\"DEC: array=%p ref=%u\", (void*)array, array->ref);");
-                        writer.WriteLine();
-                        writer.WriteLine("if (array->ref == 0)");
-                        writer.WriteLine("{");
-                        using (writer.Indent())
-                        {
-                            writer.WriteLine("for (size_t i = 0; i < array->count; ++i)");
-                            writer.WriteLine("{");
-                            using (writer.Indent())
-                            {
-                                EmitCopyDestructor("array->items[i]", arrayType.ElementType);
-                            }
-                            writer.WriteLine("}");
-                            writer.WriteLine();
-                            writer.WriteLine("rc_frees++;");
-                            writer.WriteLine("RC_DBG(\"FREE: array=%p data=%p\", (void *)array, (void *)array->items);");
-                            writer.WriteLine();
-                            writer.WriteLine("free(array);");
-                        }
-                        writer.WriteLine("}");
-                    }
-                    writer.WriteLine("}");
-                    writer.WriteLine();
-
-                    writer.WriteLine($"static inline {name} *{name}_make()");
-                    writer.WriteLine("{");
-                    using (writer.Indent())
-                    {
-                        writer.WriteLine($"{name} *array = ({name} *)malloc(sizeof({name}));");
-                        writer.WriteLine("array->ref = 1;");
-                        writer.WriteLine("array->count = 0;");
-                        writer.WriteLine("array->capacity = 0;");
-                        writer.WriteLine("array->items = NULL;");
-                        writer.WriteLine();
-                        writer.WriteLine("rc_allocs++;");
-                        writer.WriteLine($"RC_DBG(\"NEW {name}_make: array=%p ref=%u\", (void *)array, array->ref);");
-                        writer.WriteLine("return array;");
-                    }
-                    writer.WriteLine("}");
-                    writer.WriteLine();
-
-                    break;
-                }
             case NubTypeStruct structType:
                 {
                     if (!moduleGraph.TryResolveType(structType.Module, structType.Name, true, out var info) || info is not Module.TypeInfoStruct structInfo)
@@ -390,10 +277,10 @@ static inline void {{name}}_rc_inc({{name}} *array)
                     {
                         foreach (var field in structInfo.Fields)
                         {
-                            writer.WriteLine($"{CType(field.Type, field.Name)};");
+                            writer.WriteLine($"{TypeName(field.Type)} {field.Name};");
                         }
                     }
-                    writer.WriteLine($"}} {typeNames[structType]};");
+                    writer.WriteLine($"}} {name};");
                     writer.WriteLine();
 
                     break;
@@ -409,10 +296,10 @@ static inline void {{name}}_rc_inc({{name}} *array)
                     {
                         foreach (var field in anonymousStructType.Fields)
                         {
-                            writer.WriteLine($"{CType(field.Type, field.Name)};");
+                            writer.WriteLine($"{TypeName(field.Type)} {field.Name};");
                         }
                     }
-                    writer.WriteLine($"}} {typeNames[anonymousStructType]};");
+                    writer.WriteLine($"}} {name};");
                     writer.WriteLine();
 
                     break;
@@ -443,13 +330,13 @@ static inline void {{name}}_rc_inc({{name}} *array)
                             {
                                 if (variant.Type is not null)
                                 {
-                                    writer.WriteLine($"{CType(variant.Type, variant.Name)};");
+                                    writer.WriteLine($"{TypeName(variant.Type)} {variant.Name};");
                                 }
                             }
                         }
                         writer.WriteLine("};");
                     }
-                    writer.WriteLine($"}} {typeNames[enumType]};");
+                    writer.WriteLine($"}} {name};");
                     writer.WriteLine();
 
                     break;
@@ -457,6 +344,98 @@ static inline void {{name}}_rc_inc({{name}} *array)
             case NubTypeEnumVariant variantType:
                 {
                     EmitTypeDefinitionIfNotEmitted(variantType.EnumType);
+                    break;
+                }
+            case NubTypePointer pointerType:
+                {
+                    EmitTypeDefinitionIfNotEmitted(pointerType.To);
+                    writer.WriteLine($"typedef {TypeName(pointerType.To)} *{name};");
+                    break;
+                }
+            case NubTypeFunc funcType:
+                {
+                    EmitTypeDefinitionIfNotEmitted(funcType.ReturnType);
+                    foreach (var parameterType in funcType.Parameters)
+                        EmitTypeDefinitionIfNotEmitted(parameterType);
+
+                    writer.WriteLine($"typedef {TypeName(funcType.ReturnType)} (*)({string.Join(", ", funcType.Parameters.Select(TypeName))}) {name};");
+
+                    break;
+                }
+            case NubTypeArray arrayType:
+                {
+                    EmitTypeDefinitionIfNotEmitted(arrayType.ElementType);
+
+                    var backingName = Tmp();
+
+                    writer.WriteLine("typedef struct");
+                    writer.WriteLine("{");
+                    using (writer.Indent())
+                    {
+                        writer.WriteLine("size_t count;");
+                        writer.WriteLine("size_t capacity;");
+                        writer.WriteLine($"{TypeName(arrayType.ElementType)} *items;");
+                        writer.WriteLine("uint32_t ref;");
+                    }
+                    writer.WriteLine($"}} {backingName};");
+                    writer.WriteLine();
+
+                    writer.WriteLine($"typedef {backingName} *{name};");
+                    writer.WriteLine();
+
+                    writer.WriteLine($"static inline void {name}_rc_inc({name} array)");
+                    writer.WriteLine("{");
+                    using (writer.Indent())
+                    {
+                        writer.WriteLine("if (array == NULL) return;");
+                        writer.WriteLine("array->ref += 1;");
+                    }
+                    writer.WriteLine("}");
+                    writer.WriteLine();
+
+                    writer.WriteLine($"static inline void {name}_rc_dec({name} array)");
+                    writer.WriteLine("{");
+                    using (writer.Indent())
+                    {
+                        writer.WriteLine("if (array == NULL) return;");
+                        writer.WriteLine("if (array->ref == 0) return;");
+                        writer.WriteLine();
+                        writer.WriteLine("array->ref -= 1;");
+                        writer.WriteLine();
+                        writer.WriteLine("if (array->ref == 0)");
+                        writer.WriteLine("{");
+                        using (writer.Indent())
+                        {
+                            writer.WriteLine("for (size_t i = 0; i < array->count; ++i)");
+                            writer.WriteLine("{");
+                            using (writer.Indent())
+                            {
+                                EmitCopyDestructor("array->items[i]", arrayType.ElementType);
+                            }
+                            writer.WriteLine("}");
+                            writer.WriteLine();
+                            writer.WriteLine("free(array->items);");
+                            writer.WriteLine("free(array);");
+                        }
+                        writer.WriteLine("}");
+                    }
+                    writer.WriteLine("}");
+                    writer.WriteLine();
+
+                    writer.WriteLine($"static inline {name} {name}_make()");
+                    writer.WriteLine("{");
+                    using (writer.Indent())
+                    {
+                        writer.WriteLine($"{name} array = ({name})nub_alloc(sizeof({backingName}));");
+                        writer.WriteLine("array->ref = 1;");
+                        writer.WriteLine("array->count = 0;");
+                        writer.WriteLine("array->capacity = 10;");
+                        writer.WriteLine($"array->items = ({TypeName(arrayType.ElementType)}*)nub_alloc(sizeof({TypeName(arrayType.ElementType)}) * array->capacity);");
+                        writer.WriteLine("return array;");
+                    }
+                    writer.WriteLine("}");
+                    writer.WriteLine();
+
                     break;
                 }
         }
@@ -542,7 +521,7 @@ static inline void {{name}}_rc_inc({{name}} *array)
     {
         var value = EmitExpression(statement.Value);
         EmitCopyConstructor(value, statement.Value.Type);
-        writer.WriteLine($"{CType(statement.Type, statement.Name.Ident)} = {value};");
+        writer.WriteLine($"{TypeName(statement.Type)} {statement.Name.Ident} = {value};");
         scopes.Peek().DeconstructableNames.Add((statement.Name.Ident, statement.Type));
     }
 
@@ -610,7 +589,7 @@ static inline void {{name}}_rc_inc({{name}} *array)
         using (writer.Indent())
         {
             var arrayType = (NubTypeArray)statement.Array.Type;
-            writer.WriteLine($"{CType(arrayType.ElementType, statement.VariableName.Ident)} = {array}->items[{index}];");
+            writer.WriteLine($"{TypeName(arrayType.ElementType)} {statement.VariableName.Ident} = {array}->items[{index}];");
             EmitStatement(statement.Body);
         }
         writer.WriteLine("}");
@@ -643,7 +622,7 @@ static inline void {{name}}_rc_inc({{name}} *array)
                     if (@case.VariableName != null)
                     {
                         Debug.Assert(variantInfo.Type is not null);
-                        writer.WriteLine($"{CType(variantInfo.Type, @case.VariableName.Ident)} = {target}.{@case.Variant.Ident};");
+                        writer.WriteLine($"{TypeName(variantInfo.Type)} {@case.VariableName.Ident} = {target}.{@case.Variant.Ident};");
                     }
 
                     EmitStatement(@case.Body);
@@ -691,7 +670,7 @@ static inline void {{name}}_rc_inc({{name}} *array)
         if (expression.Operation == TypedNodeExpressionBinary.Op.Add && expression.Left.Type is NubTypeString && expression.Right.Type is NubTypeString)
         {
             scopes.Peek().DeconstructableNames.Add((name, expression.Type));
-            writer.WriteLine($"{CType(NubTypeString.Instance, name)} = string_concat({left}, {right});");
+            writer.WriteLine($"{TypeName(NubTypeString.Instance)} {name} = string_concat({left}, {right});");
             return name;
         }
 
@@ -715,7 +694,7 @@ static inline void {{name}}_rc_inc({{name}} *array)
             _ => throw new ArgumentOutOfRangeException()
         };
 
-        writer.WriteLine($"{CType(expression.Type, name)} = {op};");
+        writer.WriteLine($"{TypeName(expression.Type)} {name} = {op};");
 
         return name;
     }
@@ -733,7 +712,7 @@ static inline void {{name}}_rc_inc({{name}} *array)
             _ => throw new ArgumentOutOfRangeException()
         };
 
-        writer.WriteLine($"{CType(expression.Type, name)} = {op};");
+        writer.WriteLine($"{TypeName(expression.Type)} {name} = {op};");
 
         return name;
     }
@@ -761,7 +740,7 @@ static inline void {{name}}_rc_inc({{name}} *array)
 
         var initializerStrings = initializerValues.Select(x => $".{x.Key} = {x.Value}");
 
-        writer.WriteLine($"{CType(expression.Type, name)} = ({CType(expression.Type)}){{ {string.Join(", ", initializerStrings)} }};");
+        writer.WriteLine($"{TypeName(expression.Type)} {name} = ({TypeName(expression.Type)}){{ {string.Join(", ", initializerStrings)} }};");
 
         return name;
     }
@@ -786,7 +765,7 @@ static inline void {{name}}_rc_inc({{name}} *array)
             EmitCopyConstructor(value, expression.Value.Type);
         }
 
-        writer.Write($"{CType(expression.Type, name)} = ({CType(expression.Type)}){{ .tag = {tag}");
+        writer.Write($"{TypeName(expression.Type)} {name} = ({TypeName(expression.Type)}){{ .tag = {tag}");
 
         if (value != null)
             writer.WriteLine($", .{enumVariantType.Variant} = {value} }};");
@@ -801,7 +780,7 @@ static inline void {{name}}_rc_inc({{name}} *array)
         var name = Tmp();
         scopes.Peek().DeconstructableNames.Add((name, expression.Type));
 
-        writer.WriteLine($"{CType(expression.Type, name)} = {typeNames[expression.Type]}_make();");
+        writer.WriteLine($"{TypeName(expression.Type)} {name} = {TypeName(expression.Type)}_make();");
 
         foreach (var value in expression.Values)
         {
@@ -817,7 +796,7 @@ static inline void {{name}}_rc_inc({{name}} *array)
         var name = Tmp();
         scopes.Peek().DeconstructableNames.Add((name, expression.Type));
         var value = EmitExpression(expression.Value);
-        writer.WriteLine($"{CType(expression.Type, name)} = string_from_cstr({value});");
+        writer.WriteLine($"{TypeName(expression.Type)} {name} = string_from_cstr({value});");
         return name;
     }
 
@@ -865,43 +844,38 @@ static inline void {{name}}_rc_inc({{name}} *array)
         var parameterValues = expression.Parameters.Select(EmitExpression).ToList();
 
         var tmp = Tmp();
-        writer.WriteLine($"{CType(expression.Type, tmp)} = {name}({string.Join(", ", parameterValues)});");
+        writer.WriteLine($"{TypeName(expression.Type)} {tmp} = {name}({string.Join(", ", parameterValues)});");
         return tmp;
     }
 
-    public string CType(NubType node, string? varName = null)
-    {
-        referencedTypes.Add(node);
-
-        return node switch
-        {
-            NubTypeVoid => "void" + (varName != null ? $" {varName}" : ""),
-            NubTypeBool => "bool" + (varName != null ? $" {varName}" : ""),
-            NubTypeStruct type => CTypeNamed(type, varName),
-            NubTypeAnonymousStruct type => CTypeNamed(type, varName),
-            NubTypeEnum type => CTypeNamed(type, varName),
-            NubTypeEnumVariant type => CType(type.EnumType, varName),
-            NubTypeSInt type => $"i{type.Width}" + (varName != null ? $" {varName}" : ""),
-            NubTypeUInt type => $"u{type.Width}" + (varName != null ? $" {varName}" : ""),
-            NubTypePointer type => CType(type.To) + (varName != null ? $" *{varName}" : "*"),
-            NubTypeString type => "string" + (varName != null ? $" *{varName}" : "*"),
-            NubTypeFunc type => $"{CType(type.ReturnType)} (*{varName})({string.Join(", ", type.Parameters.Select(p => CType(p)))})",
-            NubTypeArray type => $"{CTypeNamed(type)}" + (varName != null ? $" *{varName}" : "*"),
-            _ => throw new ArgumentOutOfRangeException(nameof(node), node, null)
-        };
-    }
-
     private readonly Dictionary<NubType, string> typeNames = [];
 
-    private string CTypeNamed(NubType type, string? varName = null)
+    private string TypeName(NubType type)
     {
         if (!typeNames.TryGetValue(type, out var name))
         {
-            name = Tmp();
+            name = type switch
+            {
+                NubTypeVoid => "void",
+                NubTypeBool => "bool",
+                NubTypeStruct => Tmp(),
+                NubTypeAnonymousStruct => Tmp(),
+                NubTypeEnum => Tmp(),
+                NubTypeEnumVariant t => TypeName(t.EnumType),
+                NubTypeSInt t => $"int{t.Width}_t",
+                NubTypeUInt t => $"uint{t.Width}_t",
+                NubTypePointer => Tmp(),
+                NubTypeString => "string_ptr",
+                NubTypeChar => "char",
+                NubTypeFunc => Tmp(),
+                NubTypeArray => Tmp(),
+                _ => throw new NotImplementedException(),
+            };
+
             typeNames[type] = name;
         }
 
-        return $"{name}{(varName != null ? $" {varName}" : "")}";
+        return name;
     }
 
     private string Tmp()
@@ -936,7 +910,7 @@ static inline void {{name}}_rc_inc({{name}} *array)
         {
             case NubTypeArray arrayType:
                 {
-                    writer.WriteLine($"{typeNames[arrayType]}_rc_inc({value});");
+                    writer.WriteLine($"{TypeName(type)}_rc_inc({value});");
                     break;
                 }
             case NubTypeString:
@@ -1012,7 +986,7 @@ static inline void {{name}}_rc_inc({{name}} *array)
         {
             case NubTypeArray arrayType:
                 {
-                    writer.WriteLine($"{typeNames[arrayType]}_rc_dec({value});");
+                    writer.WriteLine($"{TypeName(type)}_rc_dec({value});");
                     break;
                 }
             case NubTypeString:
@@ -1159,4 +1133,4 @@ internal class IndentedTextWriter
             disposed = true;
         }
     }
-}
+}

compiler/ModuleGraph.cs

@@ -210,6 +210,7 @@ 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))
@@ -442,4 +443,4 @@ public class Module(string name)
             public NubType? Type { get; } = 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();
@@ -324,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);
@@ -420,6 +435,7 @@ public class TypeDecoder
             'U' => DecodeUInt(),
             'I' => DecodeSInt(),
             'S' => NubTypeString.Instance,
+            'C' => NubTypeChar.Instance,
             'P' => DecodePointer(),
             'F' => DecodeFunc(),
             'T' => DecodeStruct(),

compiler/Parser.cs

@@ -561,6 +561,8 @@ 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 "i8":
@@ -1060,6 +1062,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;
@@ -1090,4 +1094,4 @@ public class NodeTypeFunc(List<Token> tokens, List<NodeType> parameters, NodeTyp
 {
     public List<NodeType> Parameters { get; } = parameters;
     public NodeType ReturnType { get; } = returnType;
-}
+}

compiler/Program.cs

@@ -147,18 +147,17 @@ if (!compileLib)
     entryPoint = info.MangledName;
 }
 
-var output = Generator.Emit(functions, moduleGraph, entryPoint);
+var outFile = Generator.Emit(functions, moduleGraph, entryPoint);
-File.WriteAllText(".build/out.c", output);
 
 if (compileLib)
 {
-    Process.Start("gcc", ["-Og", "-g", "-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", "-g", "-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;
@@ -177,4 +176,4 @@ static void CleanDirectory(string dirName)
         CleanDirectory(subdir.FullName);
         subdir.Delete();
     }
-}
+}

compiler/TypeChecker.cs

@@ -494,7 +494,7 @@ public class TypeChecker
                         case "length":
                             return new TypedNodeExpressionStringLength(expression.Tokens, NubTypeUInt.Get(64), target);
                         case "ptr":
-                            return new TypedNodeExpressionStringPointer(expression.Tokens, NubTypePointer.Get(NubTypeUInt.Get(8)), target);
+                            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);
                     }
@@ -684,7 +684,7 @@ public class TypeChecker
 
     private TypedNodeExpressionStringConstructor CheckExpressionStringConstructor(NodeExpressionStringConstructor expression, NubType? expectedType)
     {
-        var stringPoitnerType = NubTypePointer.Get(NubTypeUInt.Get(8));
+        var stringPoitnerType = NubTypePointer.Get(NubTypeChar.Instance);
 
         var value = CheckExpression(expression.Value, stringPoitnerType);
         if (!value.Type.IsAssignableTo(stringPoitnerType))
@@ -1103,4 +1103,4 @@ public class TypedNodeExpressionUnary(List<Token> tokens, NubType type, TypedNod
         Negate,
         Invert,
     }
-}
+}

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 ../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

examples/core/sys.nub

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