krzosa/corelang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Type info uses slices now! Fixed a case of slice needing to have a completed type

Browse Source
This commit is contained in:
Krzosa Karol
2023-03-29 10:22:43 +02:00
parent cb630951fd
commit 7dcd53587e
6 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core_codegen_c_language.cpp
View File

@@ -980,16 +980,17 @@ compile_to_c_code() {
} break; } break;
case TYPE_LAMBDA: { case TYPE_LAMBDA: {
gen(".lambda_return = %d, ", t->func.ret->type_id); gen(".lambda_return = %d, ", t->func.ret->type_id);
gen(".lambda_argument_count = %d, ", t->func.args.len); gen(".lambda_arguments.len = %d, ", t->func.args.len);
gen(".lambda_arguments = (Type_Info[%d]){", t->func.args.len); gen(".lambda_arguments.data = (Type_Info[%d]){", t->func.args.len);
For_Named(t->func.args, arg) { For_Named(t->func.args, arg) {
gen("{.type = %d}, ", arg->type_id); gen("{.type = %d}, ", arg->type_id);
} }
gen("}"); gen("}");
} break; } break;
case TYPE_UNION:
case TYPE_STRUCT: { case TYPE_STRUCT: {
gen(".struct_member_count = %d, ", t->agg.members.len); gen(".struct_members.len = %d, ", t->agg.members.len);
gen(".struct_members = (Type_Info_Struct_Member[]){"); gen(".struct_members.data = (Type_Info_Struct_Member[]){");
For_Named(t->agg.members, m) { For_Named(t->agg.members, m) {
gen("{.name = (%Q){(uint8_t *)\"%Q\", %d}, .type = %d, .offset = %d}, ", prefixed_string_type, m.name, m.name.len, m.type->type_id, m.offset); gen("{.name = (%Q){(uint8_t *)\"%Q\", %d}, .type = %d, .offset = %d}, ", prefixed_string_type, m.name, m.name.len, m.type->type_id, m.offset);
} }

6
core_compiler.cpp
View File

@@ -356,10 +356,8 @@ Type_Info :: struct
base_type: Type base_type: Type
array_size: S64 array_size: S64
struct_member_count: S64 struct_members: []Type_Info_Struct_Member
struct_members: *Type_Info_Struct_Member lambda_arguments: []Type_Info
lambda_argument_count: S64
lambda_arguments: *Type_Info
lambda_return: Type lambda_return: Type
type_infos_len: S64 #foreign type_infos_len: S64 #foreign

6
core_typechecking.cpp
View File

@@ -1171,9 +1171,9 @@ resolve_expr(Ast_Expr *ast, Resolve_Flag flags, Ast_Type *compound_and_const_str
Operand type = resolve_expr(node->base, AST_CANT_BE_NULL, 0, 0); Operand type = resolve_expr(node->base, AST_CANT_BE_NULL, 0, 0);
Operand expr = require_const_int(node->expr, AST_CAN_BE_NULL); Operand expr = require_const_int(node->expr, AST_CAN_BE_NULL);
if (type.type != pctx->type_type) compiler_error(node->pos, "Prefix array operator is only allowed on types"); if (type.type != pctx->type_type) compiler_error(node->pos, "Prefix array operator is only allowed on types");
type_complete(type.type_val);
if (node->expr) { if (node->expr) {
type_complete(type.type_val);
type.type_val = type_array(type.type_val, bigint_as_unsigned(&expr.big_int_val)); type.type_val = type_array(type.type_val, bigint_as_unsigned(&expr.big_int_val));
} }
else { else {
@@ -1181,7 +1181,7 @@ resolve_expr(Ast_Expr *ast, Resolve_Flag flags, Ast_Type *compound_and_const_str
} }
// If this is a type we want to rewrite that type // If this is a type we want to rewrite that type
// int o an integer constant which should be an id // into an integer constant which should be an id
// of that type // of that type
if (!is_flag_set(flags, RESOLVE_TYPESPEC)) { if (!is_flag_set(flags, RESOLVE_TYPESPEC)) {
rewrite_into_const(node, Ast_Array, type.value); rewrite_into_const(node, Ast_Array, type.value);
@@ -1287,7 +1287,7 @@ resolve_expr(Ast_Expr *ast, Resolve_Flag flags, Ast_Type *compound_and_const_str
// Make sure it's a type but also not a type id // Make sure it's a type but also not a type id
Ast_Type *type = left.type; Ast_Type *type = left.type;
if (type == pctx->type_type && left.type_val) { if (type == pctx->type_type && left.type_val) {
if (is_enum(left.type_val) || is_struct(left.type_val)) { if (is_enum(left.type_val) || is_struct(left.type_val) || is_union(left.type_val)) {
type = left.type_val; type = left.type_val;
} }
} }

4
core_types.cpp
View File

@@ -272,12 +272,10 @@ type_struct_complete(Ast_Type *type, Ast_Decl *node) {
assert(it->type->kind != TYPE_INCOMPLETE); assert(it->type->kind != TYPE_INCOMPLETE);
assert(is_pow2(it->type->align)); assert(is_pow2(it->type->align));
Ast_Resolved_Member m = {};
m.offset = type->size;
type->align = max(type->align, it->type->align); type->align = max(type->align, it->type->align);
type->size = max(it->type->size, type->size); type->size = max(it->type->size, type->size);
Ast_Resolved_Member m = {};
m.name = it->name; m.name = it->name;
m.value = it->value; m.value = it->value;
members.add(m); members.add(m);

12
examples/unions.core
View File

@@ -7,9 +7,6 @@ C :: struct
a: int a: int
b: int b: int
Test :: struct
a: int
main :: (argc: int, argv: **char): int main :: (argc: int, argv: **char): int
memes: U memes: U
memes.b = 10 memes.b = 10
@@ -17,7 +14,14 @@ main :: (argc: int, argv: **char): int
Assert(memes.a != 0) Assert(memes.a != 0)
compound: U = {b = 10.0} compound: U = {b = 10.0}
c2: C = {b = 10} Assert(compound.b == 10)
t := U
ti := GetTypeInfo(t)
Assert(ti.size == SizeOf(U))
/* @reproduction @todo /* @reproduction @todo
``` ```

9
modules/Language.core
View File

@@ -1,4 +1,4 @@
/*
Any :: struct Any :: struct
data: *void data: *void
type: Type type: Type
@@ -43,10 +43,10 @@ Type_Info :: struct
base_type: Type base_type: Type
array_size: S64 array_size: S64
struct_member_count: S64
struct_members: *Type_Info_Struct_Member struct_members: *Type_Info_Struct_Member
lambda_argument_count: S64 struct_member_count: S64
lambda_arguments: *Type_Info lambda_arguments: *Type_Info
lambda_argument_count: S64
lambda_return: Type lambda_return: Type
type_infos_len: S64 #foreign type_infos_len: S64 #foreign
@@ -56,4 +56,5 @@ GetTypeInfo :: (type: Type): *Type_Info
id := type->S64 id := type->S64
if id >= type_infos_len if id >= type_infos_len
return 0 return 0
return type_infos + id return type_infos + id
*/