Compare commits

..

14 Commits

Author SHA1 Message Date
nub31
aa5a494d39 Add generic unt/uint 2026-03-16 21:13:49 +01:00
nub31
bc65c3f4fd ... 2026-03-16 18:10:03 +01:00
nub31
bdeb2c4d73 Update build 2026-03-16 17:05:24 +01:00
nub31
48760dcdda ... 2026-03-16 16:53:48 +01:00
nub31
63d0eb660b CType -> TypeName 2026-03-16 16:04:43 +01:00
nub31
918d25f8c8 perhaps 2026-03-15 01:38:59 +01:00
nub31
6e631ba1ba STR -> RC for report 2026-03-12 16:07:40 +01:00
nub31
832184053f better rc 2026-03-12 15:42:44 +01:00
nub31
2ab20652f8 ... 2026-03-10 17:53:42 +01:00
nub31
6507624e90 .. 2026-03-10 17:09:07 +01:00
nub31
83255980d7 foreach 2026-03-10 16:37:59 +01:00
nub31
1a1dc1389d ... 2026-03-09 17:35:34 +01:00
nub31
4210ad878b tmp... 2026-03-09 16:38:09 +01:00
nub31
32042d0769 Add comma parsing to func call 2026-03-09 15:44:30 +01:00
12 changed files with 1127 additions and 791 deletions

View File

@@ -1,7 +1,5 @@
using System.Diagnostics;
using System.Security.Principal;
using System.Text;
using Microsoft.VisualBasic;
namespace Compiler;
@@ -19,27 +17,138 @@ 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 HashSet<NubType> referencedTypes = new();
private readonly Dictionary<string, string> referencedStringLiterals = new();
private readonly HashSet<NubType> emittedTypes = new();
private readonly Dictionary<string, string> referencedStringLiterals = [];
private readonly HashSet<NubType> emittedTypes = [];
private readonly Stack<Scope> scopes = new();
private int tmpNameIndex = 0;
private string Emit()
{
var outPath = ".build";
var fileName = "out.c";
if (entryPoint != null)
{
writer.WriteLine($$"""
int main(int argc, char *argv[])
writer.WriteLine("int main(int argc, char *argv[])");
writer.WriteLine("{");
using (writer.Indent())
{
return {{entryPoint}}();
writer.WriteLine($"return {entryPoint}();");
}
""");
writer.WriteLine("}");
writer.WriteLine();
}
@@ -48,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)
writer.Write("extern ");
else if (info.Source == Module.DefinitionSource.Internal && !info.Extern && !info.Exported)
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())
{
@@ -67,7 +174,7 @@ public class Generator
writer.WriteLine();
}
var implementations = writer.ToString();
var definitions = writer.ToString();
writer = new IndentedTextWriter();
@@ -83,44 +190,23 @@ 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 <float.h>
#include <stdarg.h>
#include <stddef.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
""");
while (referencedTypes.Count != 0)
{
var type = referencedTypes.ElementAt(0);
EmitTypeDefinitionIfNotEmitted(type);
referencedTypes.Remove(type);
}
foreach (var (name, value) in referencedStringLiterals)
{
writer.WriteLine
(
$$"""
static struct nub_core_string {{name}} = {
static string {{name}} = (string){
.data = "{{value}}",
.length = {{value.Length}},
.length = {{Encoding.UTF8.GetByteCount(value)}},
.ref = 0,
.flags = FLAG_STRING_LITERAL
};
@@ -129,9 +215,38 @@ public class Generator
);
}
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)
@@ -141,146 +256,10 @@ public class Generator
emittedTypes.Add(type);
var name = TypeName(type);
switch (type)
{
case NubTypeString:
{
writer.WriteLine
(
"""
#define FLAG_STRING_LITERAL 1
#define STRING_DEBUG 1
#if STRING_DEBUG
#define STR_DBG(fmt, ...) fprintf(stderr, "[STR] " fmt "\n", ##__VA_ARGS__)
#else
#define STR_DBG(fmt, ...)
#endif
struct nub_core_string
{
char *data;
size_t length;
uint32_t ref;
uint32_t flags;
};
#if STRING_DEBUG
static size_t nub_core_string_allocs = 0;
static size_t nub_core_string_frees = 0;
__attribute__((destructor))
static void string_debug_report(void)
{
fprintf(stderr, "[STR] REPORT allocs=%zu frees=%zu leaks=%zu\n", nub_core_string_allocs, nub_core_string_frees, nub_core_string_allocs - nub_core_string_frees);
}
#endif
static inline void nub_core_string_rc_inc(struct nub_core_string *string)
{
if (string == NULL)
{
STR_DBG("INC null string");
return;
}
if (string->flags & FLAG_STRING_LITERAL)
return;
string->ref += 1;
STR_DBG("INC: str=%p ref=%u \"%s\"", (void*)string, string->ref, string->data);
}
static inline void nub_core_string_rc_dec(struct nub_core_string *string)
{
if (string == NULL)
{
STR_DBG("DEC null string");
return;
}
if (string->flags & FLAG_STRING_LITERAL)
return;
if (string->ref == 0)
{
STR_DBG("ERROR: DEC on zero refcount str=%p", (void*)string);
return;
}
string->ref -= 1;
STR_DBG("DEC: str=%p ref=%u \"%s\"", (void*)string, string->ref, string->data);
if (string->ref == 0)
{
STR_DBG("FREE: str=%p data=%p \"%s\"", (void*)string, (void*)string->data, string->data);
char *data_ptr = string->data;
struct nub_core_string *str_ptr = string;
#if STRING_DEBUG
nub_core_string_frees++;
memset(data_ptr, 0xDD, str_ptr->length);
memset(str_ptr, 0xDD, sizeof(*str_ptr));
#endif
free(data_ptr);
free(str_ptr);
}
}
static inline struct nub_core_string *nub_core_string_concat(struct nub_core_string *left, struct nub_core_string *right)
{
size_t new_length = left->length + right->length;
struct nub_core_string *result = malloc(sizeof(struct nub_core_string));
result->data = 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;
#if STRING_DEBUG
nub_core_string_allocs++;
STR_DBG("NEW concat: str=%p ref=%u \"%s\"", (void*)result, result->ref, result->data);
#endif
return result;
}
static inline struct nub_core_string *nub_core_string_from_cstr(char* cstr)
{
size_t len = strlen(cstr);
struct nub_core_string *result = malloc(sizeof(struct nub_core_string));
result->data = malloc(len + 1);
memcpy(result->data, cstr, len + 1);
result->length = len;
result->ref = 1;
result->flags = 0;
#if STRING_DEBUG
nub_core_string_allocs++;
STR_DBG("NEW from_cstr: str=%p ref=%u \"%s\"", (void*)result, result->ref, result->data);
#endif
return result;
}
"""
);
break;
}
case NubTypeStruct structType:
{
if (!moduleGraph.TryResolveType(structType.Module, structType.Name, true, out var info) || info is not Module.TypeInfoStruct structInfo)
@@ -289,21 +268,19 @@ public class Generator
foreach (var field in structInfo.Fields)
EmitTypeDefinitionIfNotEmitted(field.Type);
writer.Write("struct ");
if (structInfo.Packed)
writer.Write("__attribute__((__packed__)) ");
writer.WriteLine(NameMangler.Mangle(structType.Module, structType.Name, structType));
writer.WriteLine("typedef struct");
writer.WriteLine("{");
using (writer.Indent())
{
foreach (var field in structInfo.Fields)
{
writer.WriteLine($"{CType(field.Type, field.Name)};");
writer.WriteLine($"{TypeName(field.Type)} {field.Name};");
}
}
writer.WriteLine("};");
writer.WriteLine($"}} {name};");
writer.WriteLine();
break;
@@ -313,16 +290,16 @@ public class Generator
foreach (var field in anonymousStructType.Fields)
EmitTypeDefinitionIfNotEmitted(field.Type);
writer.WriteLine($"struct {NameMangler.Mangle("anonymous", "struct", anonymousStructType)}");
writer.WriteLine("typedef struct");
writer.WriteLine("{");
using (writer.Indent())
{
foreach (var field in anonymousStructType.Fields)
{
writer.WriteLine($"{CType(field.Type, field.Name)};");
writer.WriteLine($"{TypeName(field.Type)} {field.Name};");
}
}
writer.WriteLine("};");
writer.WriteLine($"}} {name};");
writer.WriteLine();
break;
@@ -340,7 +317,7 @@ public class Generator
}
}
writer.WriteLine($"struct {NameMangler.Mangle(enumType.Module, enumType.Name, enumType)}");
writer.WriteLine("typedef struct");
writer.WriteLine("{");
using (writer.Indent())
{
@@ -353,13 +330,13 @@ public class Generator
{
if (variant.Type is not null)
{
writer.WriteLine($"{CType(variant.Type, variant.Name)};");
writer.WriteLine($"{TypeName(variant.Type)} {variant.Name};");
}
}
}
writer.WriteLine("};");
}
writer.WriteLine("};");
writer.WriteLine($"}} {name};");
writer.WriteLine();
break;
@@ -367,6 +344,98 @@ public class Generator
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;
}
}
@@ -400,6 +469,9 @@ public class Generator
case TypedNodeStatementWhile statement:
EmitStatementWhile(statement);
break;
case TypedNodeStatementFor statement:
EmitStatementFor(statement);
break;
case TypedNodeStatementMatch statement:
EmitStatementMatch(statement);
break;
@@ -449,7 +521,7 @@ public class Generator
{
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));
}
@@ -508,6 +580,21 @@ public class Generator
writer.WriteLine("}");
}
private void EmitStatementFor(TypedNodeStatementFor statement)
{
var index = Tmp();
var array = EmitExpression(statement.Array);
writer.WriteLine($"for (size_t {index} = 0; {index} < {array}->count; ++{index})");
writer.WriteLine("{");
using (writer.Indent())
{
var arrayType = (NubTypeArray)statement.Array.Type;
writer.WriteLine($"{TypeName(arrayType.ElementType)} {statement.VariableName.Ident} = {array}->items[{index}];");
EmitStatement(statement.Body);
}
writer.WriteLine("}");
}
private void EmitStatementMatch(TypedNodeStatementMatch statement)
{
var target = EmitExpression(statement.Target);
@@ -535,7 +622,7 @@ public class Generator
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);
@@ -559,10 +646,13 @@ public class Generator
TypedNodeExpressionStringLiteral expression => EmitExpressionStringLiteral(expression),
TypedNodeExpressionStructLiteral expression => EmitExpressionStructLiteral(expression),
TypedNodeExpressionEnumLiteral expression => EmitExpressionEnumLiteral(expression),
TypedNodeExpressionArrayLiteral expression => EmitNodeExpressionArrayLiteral(expression),
TypedNodeExpressionStringConstructor expression => EmitExpressionStringConstructor(expression),
TypedNodeExpressionStructMemberAccess expression => EmitExpressionMemberAccess(expression),
TypedNodeExpressionStringLength expression => EmitExpressionStringLength(expression),
TypedNodeExpressionStringPointer expression => EmitExpressionStringPointer(expression),
TypedNodeExpressionArrayCount expression => EmitExpressionArrayCount(expression),
TypedNodeExpressionArrayPointer expression => EmitExpressionArrayPointer(expression),
TypedNodeExpressionLocalIdent expression => expression.Name,
TypedNodeExpressionGlobalIdent expression => EmitNodeExpressionGlobalIdent(expression),
TypedNodeExpressionFuncCall expression => EmitExpressionFuncCall(expression),
@@ -580,7 +670,7 @@ public class Generator
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)} = nub_core_string_concat({left}, {right});");
writer.WriteLine($"{TypeName(NubTypeString.Instance)} {name} = string_concat({left}, {right});");
return name;
}
@@ -604,7 +694,7 @@ public class Generator
_ => throw new ArgumentOutOfRangeException()
};
writer.WriteLine($"{CType(expression.Type, name)} = {op};");
writer.WriteLine($"{TypeName(expression.Type)} {name} = {op};");
return name;
}
@@ -622,7 +712,7 @@ public class Generator
_ => throw new ArgumentOutOfRangeException()
};
writer.WriteLine($"{CType(expression.Type, name)} = {op};");
writer.WriteLine($"{TypeName(expression.Type)} {name} = {op};");
return name;
}
@@ -650,7 +740,7 @@ public class Generator
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;
}
@@ -675,12 +765,28 @@ public class Generator
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} }};");
else
writer.WriteLine(" }};");
writer.WriteLine(" };");
return name;
}
private string EmitNodeExpressionArrayLiteral(TypedNodeExpressionArrayLiteral expression)
{
var name = Tmp();
scopes.Peek().DeconstructableNames.Add((name, expression.Type));
writer.WriteLine($"{TypeName(expression.Type)} {name} = {TypeName(expression.Type)}_make();");
foreach (var value in expression.Values)
{
var valueName = EmitExpression(value);
writer.WriteLine($"da_append({name}, {valueName});");
}
return name;
}
@@ -690,7 +796,7 @@ public class Generator
var name = Tmp();
scopes.Peek().DeconstructableNames.Add((name, expression.Type));
var value = EmitExpression(expression.Value);
writer.WriteLine($"{CType(expression.Type, name)} = nub_core_string_from_cstr({value});");
writer.WriteLine($"{TypeName(expression.Type)} {name} = string_from_cstr({value});");
return name;
}
@@ -712,6 +818,18 @@ public class Generator
return $"{target}->data";
}
private string EmitExpressionArrayCount(TypedNodeExpressionArrayCount expression)
{
var target = EmitExpression(expression.Target);
return $"{target}->count";
}
private string EmitExpressionArrayPointer(TypedNodeExpressionArrayPointer expression)
{
var target = EmitExpression(expression.Target);
return $"{target}->items";
}
private string EmitNodeExpressionGlobalIdent(TypedNodeExpressionGlobalIdent expression)
{
if (!moduleGraph.TryResolveIdentifier(expression.Module, expression.Name, true, out var info))
@@ -726,34 +844,38 @@ public class Generator
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);
private readonly Dictionary<NubType, string> typeNames = [];
return node switch
private string TypeName(NubType type)
{
NubTypeVoid => "void" + (varName != null ? $" {varName}" : ""),
NubTypeBool => "bool" + (varName != null ? $" {varName}" : ""),
NubTypeStruct type => $"struct {NameMangler.Mangle(type.Module, type.Name, type)}" + (varName != null ? $" {varName}" : ""),
NubTypeAnonymousStruct type => CTypeAnonymousStruct(type, varName),
NubTypeEnum type => $"struct {NameMangler.Mangle(type.Module, type.Name, type)}" + (varName != null ? $" {varName}" : ""),
NubTypeEnumVariant type => CType(type.EnumType, varName),
NubTypeSInt type => $"int{type.Width}_t" + (varName != null ? $" {varName}" : ""),
NubTypeUInt type => $"uint{type.Width}_t" + (varName != null ? $" {varName}" : ""),
NubTypePointer type => CType(type.To) + (varName != null ? $" *{varName}" : "*"),
NubTypeString type => "struct nub_core_string" + (varName != null ? $" *{varName}" : "*"),
NubTypeFunc type => $"{CType(type.ReturnType)} (*{varName})({string.Join(", ", type.Parameters.Select(p => CType(p)))})",
_ => throw new ArgumentOutOfRangeException(nameof(node), node, null)
if (!typeNames.TryGetValue(type, out var name))
{
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;
}
private static string CTypeAnonymousStruct(NubTypeAnonymousStruct type, string? varName)
{
return $"struct {NameMangler.Mangle("anonymous", "struct", type)}{(varName != null ? $" {varName}" : "")}";
return name;
}
private string Tmp()
@@ -786,9 +908,14 @@ public class Generator
{
switch (type)
{
case NubTypeArray arrayType:
{
writer.WriteLine($"{TypeName(type)}_rc_inc({value});");
break;
}
case NubTypeString:
{
writer.WriteLine($"nub_core_string_rc_inc({value});");
writer.WriteLine($"string_rc_inc({value});");
break;
}
case NubTypeStruct structType:
@@ -857,9 +984,14 @@ public class Generator
{
switch (type)
{
case NubTypeArray arrayType:
{
writer.WriteLine($"{TypeName(type)}_rc_dec({value});");
break;
}
case NubTypeString:
{
writer.WriteLine($"nub_core_string_rc_dec({value});");
writer.WriteLine($"string_rc_dec({value});");
break;
}
case NubTypeStruct structType:

View File

@@ -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))
};
}

View File

@@ -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)

View File

@@ -263,8 +263,17 @@ public class Parser
if (TryExpectKeyword(Keyword.While))
{
var condition = ParseExpression();
var thenBlock = ParseStatement();
return new NodeStatementWhile(TokensFrom(startIndex), condition, thenBlock);
var block = ParseStatement();
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))
@@ -363,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>();
@@ -467,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);
}
@@ -521,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)
@@ -529,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":
@@ -539,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":
@@ -883,6 +921,13 @@ 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;
@@ -931,6 +976,11 @@ public class NodeExpressionEnumLiteral(List<Token> tokens, NodeTypeNamed type, N
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 NodeExpression Value { get; } = value;
@@ -1016,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;
@@ -1032,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;

View File

@@ -144,27 +144,20 @@ if (!compileLib)
return 1;
}
if (entryPointType.Parameters.Any())
{
DiagnosticFormatter.Print(Diagnostic.Error($"Entrypoint must not take any parameters").Build(), Console.Error);
return 1;
}
entryPoint = info.MangledName;
}
var output = Generator.Emit(functions, moduleGraph, entryPoint);
File.WriteAllText(".build/out.c", output);
var outFile = Generator.Emit(functions, moduleGraph, entryPoint);
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;

View File

@@ -203,6 +203,16 @@ public class Tokenizer
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();
@@ -395,6 +405,8 @@ public class Tokenizer
"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),
@@ -497,6 +509,8 @@ public enum Symbol
CloseCurly,
OpenParen,
CloseParen,
OpenSquare,
CloseSquare,
Comma,
Period,
Colon,
@@ -545,6 +559,8 @@ public enum Keyword
If,
Else,
While,
For,
In,
Return,
Module,
Export,
@@ -566,6 +582,8 @@ public static class TokenExtensions
Symbol.CloseCurly => "}",
Symbol.OpenParen => "(",
Symbol.CloseParen => ")",
Symbol.OpenSquare => "[",
Symbol.CloseSquare => "]",
Symbol.Comma => ",",
Symbol.Period => ".",
Symbol.Colon => ":",
@@ -613,6 +631,8 @@ public static class TokenExtensions
Keyword.If => "if",
Keyword.Else => "else",
Keyword.While => "while",
Keyword.For => "for",
Keyword.In => "in",
Keyword.Return => "return",
Keyword.Module => "module",
Keyword.Export => "export",

View File

@@ -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))
};
@@ -204,6 +205,22 @@ public class TypeChecker
}
}
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)
{
var target = CheckExpression(statement.Target, null);
@@ -264,6 +281,7 @@ public class TypeChecker
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))
};
}
@@ -476,9 +494,21 @@ 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 string", expression.Name);
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:
@@ -642,10 +672,10 @@ public class TypeChecker
throw BasicError($"Enum '{variantType.EnumType}' does not have a variant named '{variantType.Variant}'", expression.Type);
if (expression.Value == null && variant.Type is not null)
throw BasicError($"Enum variant '{variantType.EnumType}' expects a value of type '{variant.Type}'", expression.Type);
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.EnumType}' does not expect any data", expression.Value);
throw BasicError($"Enum variant '{variantType}' does not expect any data", expression.Value);
var value = expression.Value == null ? null : CheckExpression(expression.Value, variant.Type);
@@ -654,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))
@@ -663,6 +693,31 @@ public class TypeChecker
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
@@ -676,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))
};
}
@@ -895,6 +951,13 @@ 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;
@@ -949,6 +1012,11 @@ public class TypedNodeExpressionStringConstructor(List<Token> tokens, NubType ty
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;
@@ -965,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;

21
examples/build Executable file
View File

@@ -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

View File

@@ -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

View File

@@ -1,7 +1,7 @@
module core
export func print(text: string) {
sys::write(0 text.ptr text.length)
sys::write(0, text.ptr, text.length)
}
export func println(text: string) {

View File

@@ -1,5 +1,5 @@
module sys
export extern func read(fd: u32, buf: ^u8, count: u64): i64
export extern func write(fd: u32, buf: ^u8, count: u64): i64
export extern func open(fileName: ^u8, flags: i32, mode: u16): i64
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

View File

@@ -11,27 +11,22 @@ enum Message {
}
func main(): i32 {
core::println("Hello, world!")
core::println("Hello" + "World")
let message = getMessage()
let x = new string("test".ptr) + " " + "uwu"
core::println(x)
let newStr = new string("cstring".ptr)
core::println(newStr)
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")
}
Say msg {
core::println(msg)
}
}
return 0
}
func getMessage(): Message {
return new Message::Say("test")
}