aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--compile.c46
-rw-r--r--compile.h3
-rw-r--r--types.c6
-rw-r--r--types.h4
4 files changed, 39 insertions, 20 deletions
diff --git a/compile.c b/compile.c
index ecca712d..c2235fb9 100644
--- a/compile.c
+++ b/compile.c
@@ -11,15 +11,43 @@
#include "typecheck.h"
#include "util.h"
-CORD compile_type_ast(env_t *env, type_ast_t *t)
+CORD compile_type_ast(type_ast_t *t)
{
- (void)env;
switch (t->tag) {
case VarTypeAST: return CORD_cat(Match(t, VarTypeAST)->name, "_t");
+ case PointerTypeAST: return CORD_cat(compile_type_ast(Match(t, PointerTypeAST)->pointed), "*");
+ case TableTypeAST: return "table_t";
+ case ArrayTypeAST: return "array_t";
+ case FunctionTypeAST: return "const void*";
default: code_err(t, "Not implemented");
}
}
+CORD compile_type(type_t *t)
+{
+ switch (t->tag) {
+ case AbortType: return "void";
+ case VoidType: return "void";
+ case MemoryType: return "void";
+ case BoolType: return "Bool_t";
+ case IntType: return CORD_asprintf("Int%ld_t", Match(t, IntType)->bits);
+ case NumType: return CORD_asprintf("Num%ld_t", Match(t, NumType)->bits);
+ case StringType: {
+ const char *dsl = Match(t, StringType)->dsl;
+ return dsl ? CORD_cat(dsl, "_t") : "Str_t";
+ }
+ case ArrayType: return "array_t";
+ case TableType: return "table_t";
+ case FunctionType: return "const void*";
+ case ClosureType: compiler_err(NULL, NULL, NULL, "Not implemented");
+ case PointerType: return CORD_cat(compile_type(Match(t, PointerType)->pointed), "*");
+ case StructType: return CORD_cat(Match(t, StructType)->name, "_t");
+ case EnumType: return CORD_cat(Match(t, EnumType)->name, "_t");
+ case TypeInfoType: return "TypeInfo";
+ default: compiler_err(NULL, NULL, NULL, "Not implemented");
+ }
+}
+
CORD compile_statement(env_t *env, ast_t *ast)
{
CORD stmt;
@@ -65,7 +93,7 @@ CORD compile_string(env_t *env, ast_t *ast, CORD color)
CORD compile(env_t *env, ast_t *ast)
{
switch (ast->tag) {
- case Nil: return CORD_asprintf("$Null(%r)", compile_type_ast(env, Match(ast, Nil)->type));
+ case Nil: return CORD_asprintf("$Null(%r)", compile_type_ast(Match(ast, Nil)->type));
case Bool: return Match(ast, Bool)->b ? "yes" : "no";
case Var: return Match(ast, Var)->name;
case Int: return CORD_asprintf("I%ld(%ld)", Match(ast, Int)->bits, Match(ast, Int)->i);
@@ -389,20 +417,20 @@ CORD compile(env_t *env, ast_t *ast)
case FunctionDef: {
auto fndef = Match(ast, FunctionDef);
CORD name = compile(env, fndef->name);
- CORD_appendf(&env->code->staticdefs, "static %r %r_(", fndef->ret_type ? compile_type_ast(env, fndef->ret_type) : "void", name);
+ CORD_appendf(&env->code->staticdefs, "static %r %r_(", fndef->ret_type ? compile_type_ast(fndef->ret_type) : "void", name);
for (arg_ast_t *arg = fndef->args; arg; arg = arg->next) {
- CORD_appendf(&env->code->staticdefs, "%r %s", compile_type_ast(env, arg->type), arg->name);
+ CORD_appendf(&env->code->staticdefs, "%r %s", compile_type_ast(arg->type), arg->name);
if (arg->next) env->code->staticdefs = CORD_cat(env->code->staticdefs, ", ");
}
env->code->staticdefs = CORD_cat(env->code->staticdefs, ");\n");
CORD kwargs = CORD_asprintf("#define %r(...) ({ struct {", name);
CORD passed_args = CORD_EMPTY;
- CORD_appendf(&env->code->funcs, "%r %r_(", fndef->ret_type ? compile_type_ast(env, fndef->ret_type) : "void", name);
+ CORD_appendf(&env->code->funcs, "%r %r_(", fndef->ret_type ? compile_type_ast(fndef->ret_type) : "void", name);
env_t *body_scope = fresh_scope(env);
body_scope->locals->fallback = env->globals;
for (arg_ast_t *arg = fndef->args; arg; arg = arg->next) {
- CORD arg_type = compile_type_ast(env, arg->type);
+ CORD arg_type = compile_type_ast(arg->type);
CORD_appendf(&env->code->funcs, "%r %s", arg_type, arg->name);
if (arg->next) env->code->funcs = CORD_cat(env->code->funcs, ", ");
CORD_appendf(&kwargs, "%r %s; ", arg_type, arg->name);
@@ -483,7 +511,7 @@ CORD compile(env_t *env, ast_t *ast)
CORD_appendf(&env->code->typecode, "struct %s_s {\n", def->name);
for (arg_ast_t *field = def->fields; field; field = field->next) {
- CORD type = compile_type_ast(env, field->type);
+ CORD type = compile_type_ast(field->type);
CORD_appendf(&env->code->typecode, "%r %s%s;\n", type, field->name,
CORD_cmp(type, "Bool_t") ? "" : ":1");
}
@@ -526,7 +554,7 @@ CORD compile(env_t *env, ast_t *ast)
for (tag_ast_t *tag = def->tags; tag; tag = tag->next) {
env->code->typecode = CORD_cat(env->code->typecode, "struct {\n");
for (arg_ast_t *field = tag->fields; field; field = field->next) {
- CORD type = compile_type_ast(env, field->type);
+ CORD type = compile_type_ast(field->type);
CORD_appendf(&env->code->typecode, "%r %s%s;\n", type, field->name,
CORD_cmp(type, "Bool_t") ? "" : ":1");
}
diff --git a/compile.h b/compile.h
index ac465d7a..f17178a2 100644
--- a/compile.h
+++ b/compile.h
@@ -12,7 +12,8 @@ typedef struct {
} module_code_t;
module_code_t compile_file(ast_t *ast);
-CORD compile_type_ast(env_t *env, type_ast_t *t);
+CORD compile_type_ast(type_ast_t *t);
+CORD compile_type(type_t *t);
CORD compile(env_t *env, ast_t *ast);
CORD compile_statement(env_t *env, ast_t *ast);
CORD compile_type_info(env_t *env, type_t *t);
diff --git a/types.c b/types.c
index 68d3c309..188b3512 100644
--- a/types.c
+++ b/types.c
@@ -100,9 +100,6 @@ CORD type_to_cord(type_t *t) {
// c = CORD_cat(c, ")");
// return c;
}
- case PlaceholderType: {
- return Match(t, PlaceholderType)->name;
- }
case TypeInfoType: {
return "TypeInfo";
}
@@ -133,7 +130,6 @@ bool type_eq(type_t *a, type_t *b)
{
if (a == b) return true;
if (a->tag != b->tag) return false;
- if (a->tag == PlaceholderType) return a == b;
return (CORD_cmp(type_to_cord(a), type_to_cord(b)) == 0);
}
@@ -492,7 +488,6 @@ size_t type_size(type_t *t)
errx(1, "Not implemented");
}
case TypeInfoType: return sizeof(TypeInfo);
- case PlaceholderType: errx(1, "This should not be reachable");
}
errx(1, "This should not be reachable");
}
@@ -518,7 +513,6 @@ size_t type_align(type_t *t)
errx(1, "Not implemented");
}
case TypeInfoType: return __alignof__(TypeInfo);
- case PlaceholderType: errx(1, "This should not be reachable");
}
errx(1, "This should not be reachable");
}
diff --git a/types.h b/types.h
index 99cb9d4a..4fcc391f 100644
--- a/types.h
+++ b/types.h
@@ -46,7 +46,6 @@ struct type_s {
StructType,
EnumType,
TypeInfoType,
- PlaceholderType,
} tag;
union {
@@ -87,9 +86,6 @@ struct type_s {
tag_t *tags;
} EnumType;
struct {} TypeInfoType;
- struct {
- const char *filename, *name;
- } PlaceholderType;
} __data;
};
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-01 14:07:30 +0000