Experiments/libabacus
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Properly handle placeholder types.

Browse Source
This commit is contained in:
Danila Fedorin 2018-06-17 20:21:40 -07:00
parent 827dba9013
commit 6822c97750
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util.c
View File

@ -95,19 +95,27 @@ libab_result libab_resolve_parsetype_copy(libab_parsetype* to_resolve,
libab_ref* into) { libab_ref* into) {
libab_result result = LIBAB_SUCCESS; libab_result result = LIBAB_SUCCESS;
libab_parsetype* parsetype; libab_parsetype* parsetype;
int is_placeholer = to_resolve->variant & LIBABACUS_TYPE_F_PLACE;
if((parsetype = malloc(sizeof(*parsetype)))) { if((parsetype = malloc(sizeof(*parsetype)))) {
parsetype->variant = to_resolve->variant | LIBABACUS_TYPE_F_RESOLVED; parsetype->variant = to_resolve->variant;
if(!is_placeholer) {
parsetype->variant |= LIBABACUS_TYPE_F_RESOLVED;
}
} else { } else {
result = LIBAB_MALLOC; result = LIBAB_MALLOC;
} }
if(result == LIBAB_SUCCESS) { if(result == LIBAB_SUCCESS) {
if(!is_placeholer) {
libab_basetype* parent_basetype = libab_get_basetype(to_resolve, scope); libab_basetype* parent_basetype = libab_get_basetype(to_resolve, scope);
if(parent_basetype) { if(parent_basetype) {
parsetype->data_u.base = parent_basetype; parsetype->data_u.base = parent_basetype;
} else { } else {
result = LIBAB_UNKNOWN_TYPE; result = LIBAB_UNKNOWN_TYPE;
} }
} else {
result = libab_copy_string(&parsetype->data_u.name, to_resolve->data_u.name);
}
} }
@ -388,7 +396,7 @@ libab_basetype* libab_get_basetype(libab_parsetype* type, libab_table* scope) {
to_return = libab_table_search_basetype(scope, type->data_u.name); to_return = libab_table_search_basetype(scope, type->data_u.name);
if(to_return == NULL) { if(to_return == NULL) {
libab_table_search_type_param(scope, type->data_u.name, &type_param); libab_table_search_type_param(scope, type->data_u.name, &type_param);
to_return = libab_ref_get(&type_param); to_return = ((libab_parsetype*)libab_ref_get(&type_param))->data_u.base;
libab_ref_free(&type_param); libab_ref_free(&type_param);
} }
} }