qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 14:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Copy type chain for type aliases

Browse source 
The full_type branch of an alias splitter (alias with null name) needs
to mirror the clean side up to the type alias. It is causing problems
with functions, but that's expected because parameters complicate
things.
This commit is contained in:
Bill Currie 2020-03-28 17:13:47 +09:00
parent ec3c2426ff
commit da39e675b8
1 changed files with 57 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
tools/qfcc/source/type.c
View file

@ -50,7 +50,6 @@
#include "class.h" #include "class.h"
#include "def.h" #include "def.h"
#include "diagnostic.h" #include "diagnostic.h"
#include "dot.h"
#include "expr.h" #include "expr.h"
#include "function.h" #include "function.h"
#include "obj_type.h" #include "obj_type.h"
@ -208,6 +207,60 @@ free_type (type_t *type)
FREE (types, type); FREE (types, type);
} }
static type_t *
copy_chain (type_t *type, type_t *append)
{
type_t *new = 0;
type_t **n = &new;
while (type) {
*n = new_type ();
**n = *type;
switch (type->meta) {
case ty_basic:
switch (type->type) {
case ev_void:
case ev_string:
case ev_float:
case ev_vector:
case ev_entity:
case ev_type_count:
case ev_quat:
case ev_integer:
case ev_uinteger:
case ev_short:
case ev_double:
internal_error (0, "copy basic type");
case ev_field:
case ev_pointer:
n = &(*n)->t.fldptr.type;
type = type->t.fldptr.type;
break;
case ev_func:
n = &(*n)->t.func.type;
type = type->t.func.type;
break;
case ev_invalid:
internal_error (0, "invalid basic type");
break;
}
break;
case ty_array:
n = &(*n)->t.array.type;
type = type->t.array.type;
break;
case ty_struct:
case ty_union:
case ty_enum:
case ty_class:
case ty_alias: //XXX is this correct?
internal_error (0, "copy object type %d", type->meta);
}
}
*n = append;
return new;
}
type_t * type_t *
append_type (type_t *type, type_t *new) append_type (type_t *type, type_t *new)
{ {
@ -255,9 +308,10 @@ append_type (type_t *type, type_t *new)
internal_error (0, "append to object type"); internal_error (0, "append to object type");
} }
} }
if (new->meta == ty_alias) { if (type && new->meta == ty_alias) {
type_t *chain = find_type (copy_chain (type, new));
*t = new->t.alias.aux_type; *t = new->t.alias.aux_type;
type = alias_type (type, new, 0); type = alias_type (type, chain, 0);
} else { } else {
*t = new; *t = new;
} }