X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type.c;h=2725265c9b3c6d3c5b84fd826898615a9fa8c8b1;hb=1e7458bc3eba2e714c913fa35aa397d54ed99a42;hp=36ca1c5ad61672acc1ab3aeaee4ae0d08e77314d;hpb=5c350f5bc775f92a6fb5131e54b2e818574843aa;p=cparser diff --git a/type.c b/type.c index 36ca1c5..2725265 100644 --- a/type.c +++ b/type.c @@ -1,21 +1,25 @@ #include +#include +#include #include "type_t.h" +#include "type_hash.h" #include "adt/error.h" -static struct obstack _type_obst; -struct obstack *type_obst = &_type_obst; -static FILE *out; +static struct obstack _type_obst; +struct obstack *type_obst = &_type_obst; +static FILE *out; +static int type_visited = 0; -static void intern_print_type_pre(const type_t *type); -static void intern_print_type_post(const type_t *type); +static void intern_print_type_pre(const type_t *type, bool top); +static void intern_print_type_post(const type_t *type, bool top); -void init_types() +void init_types(void) { obstack_init(type_obst); } -void exit_types() +void exit_types(void) { obstack_free(type_obst, NULL); } @@ -25,21 +29,16 @@ void type_set_output(FILE *stream) out = stream; } -static -void print_type_qualifiers(unsigned qualifiers) +void inc_type_visited(void) { - if(qualifiers & TYPE_QUALIFIER_CONST) { - fputs("const ", out); - } - if(qualifiers & TYPE_QUALIFIER_VOLATILE) { - fputs("volatile ", out); - } - if(qualifiers & TYPE_QUALIFIER_RESTRICT) { - fputs("restrict ", out); - } - if(qualifiers & TYPE_QUALIFIER_INLINE) { - fputs("inline ", out); - } + type_visited++; +} + +void print_type_qualifiers(type_qualifiers_t qualifiers) +{ + if(qualifiers & TYPE_QUALIFIER_CONST) fputs("const ", out); + if(qualifiers & TYPE_QUALIFIER_VOLATILE) fputs("volatile ", out); + if(qualifiers & TYPE_QUALIFIER_RESTRICT) fputs("restrict ", out); } static @@ -47,57 +46,73 @@ void print_atomic_type(const atomic_type_t *type) { print_type_qualifiers(type->type.qualifiers); - switch(type->atype) { - case ATOMIC_TYPE_INVALID: fputs("INVALIDATOMIC", out); return; - case ATOMIC_TYPE_VOID: fputs("void", out); return; - case ATOMIC_TYPE_BOOL: fputs("bool", out); return; - case ATOMIC_TYPE_CHAR: fputs("char", out); return; - case ATOMIC_TYPE_SCHAR: fputs("signed char", out); return; - case ATOMIC_TYPE_UCHAR: fputs("unsigned char", out); return; - case ATOMIC_TYPE_INT: fputs("int", out); return; - case ATOMIC_TYPE_UINT: fputs("unsigned int", out); return; - case ATOMIC_TYPE_SHORT: fputs("short", out); return; - case ATOMIC_TYPE_USHORT: fputs("unsigned short", out); return; - case ATOMIC_TYPE_LONG: fputs("long", out); return; - case ATOMIC_TYPE_ULONG: fputs("unsigned long", out); return; - case ATOMIC_TYPE_LONGLONG: fputs("long long", out); return; - case ATOMIC_TYPE_ULONGLONG: fputs("unsigned long long", out); return; - case ATOMIC_TYPE_LONG_DOUBLE: fputs("long double", out); return; - case ATOMIC_TYPE_FLOAT: fputs("float", out); return; - case ATOMIC_TYPE_DOUBLE: fputs("double", out); return; - } - fputs("UNKNOWNATOMIC", out); + const char *s; + switch(type->akind) { + case ATOMIC_TYPE_INVALID: s = "INVALIDATOMIC"; break; + case ATOMIC_TYPE_VOID: s = "void"; break; + case ATOMIC_TYPE_BOOL: s = "_Bool"; break; + case ATOMIC_TYPE_CHAR: s = "char"; break; + case ATOMIC_TYPE_SCHAR: s = "signed char"; break; + case ATOMIC_TYPE_UCHAR: s = "unsigned char"; break; + case ATOMIC_TYPE_INT: s = "int"; break; + case ATOMIC_TYPE_UINT: s = "unsigned int"; break; + case ATOMIC_TYPE_SHORT: s = "short"; break; + case ATOMIC_TYPE_USHORT: s = "unsigned short"; break; + case ATOMIC_TYPE_LONG: s = "long"; break; + case ATOMIC_TYPE_ULONG: s = "unsigned long"; break; + case ATOMIC_TYPE_LONGLONG: s = "long long"; break; + case ATOMIC_TYPE_ULONGLONG: s = "unsigned long long"; break; + case ATOMIC_TYPE_LONG_DOUBLE: s = "long double"; break; + case ATOMIC_TYPE_FLOAT: s = "float"; break; + case ATOMIC_TYPE_DOUBLE: s = "double"; break; + default: s = "UNKNOWNATOMIC"; break; + } + fputs(s, out); } -static -void print_method_type_pre(const method_type_t *type) +static void print_function_type_pre(const function_type_t *type, bool top) { print_type_qualifiers(type->type.qualifiers); - intern_print_type_pre(type->result_type); + intern_print_type_pre(type->return_type, false); - /* TODO: don't emit braces if we're the toplevel type... */ - fputc('(', out); + /* don't emit braces if we're the toplevel type... */ + if(!top) + fputc('(', out); } -static -void print_method_type_post(const method_type_t *type) +static void print_function_type_post(const function_type_t *type, + const context_t *context, bool top) { - /* TODO: don't emit braces if we're the toplevel type... */ - intern_print_type_post(type->result_type); - fputc(')', out); + intern_print_type_post(type->return_type, false); + /* don't emit braces if we're the toplevel type... */ + if(!top) + fputc(')', out); fputc('(', out); - method_parameter_t *parameter = type->parameters; int first = 1; - for( ; parameter != NULL; parameter = parameter->next) { - if(first) { - first = 0; - } else { - fputs(", ", out); + if(context == NULL) { + function_parameter_t *parameter = type->parameters; + for( ; parameter != NULL; parameter = parameter->next) { + if(first) { + first = 0; + } else { + fputs(", ", out); + } + print_type(parameter->type); + } + } else { + declaration_t *parameter = context->declarations; + for( ; parameter != NULL; parameter = parameter->next) { + if(first) { + first = 0; + } else { + fputs(", ", out); + } + print_type_ext(parameter->type, parameter->symbol, + ¶meter->context); } - print_type(parameter->type, NULL); } if(type->variadic) { if(first) { @@ -113,123 +128,300 @@ void print_method_type_post(const method_type_t *type) fputc(')', out); } -static -void print_pointer_type_pre(const pointer_type_t *type) +static void print_pointer_type_pre(const pointer_type_t *type) { - intern_print_type_pre(type->points_to); + intern_print_type_pre(type->points_to, false); fputs("*", out); print_type_qualifiers(type->type.qualifiers); } -static -void print_pointer_type_post(const pointer_type_t *type) +static void print_pointer_type_post(const pointer_type_t *type) { - intern_print_type_post(type->points_to); + intern_print_type_post(type->points_to, false); } -static -void print_type_enum(const enum_type_t *type) +static void print_array_type_pre(const array_type_t *type) { + intern_print_type_pre(type->element_type, false); +} + +static void print_array_type_post(const array_type_t *type) +{ + fputc('[', out); + if(type->is_static) { + fputs("static ", out); + } print_type_qualifiers(type->type.qualifiers); - if(type->symbol != NULL) { - fprintf(out, "enum %s", type->symbol->string); - } else { - fprintf(out, "enum {\n"); - - enum_entry_t *entry = type->entries; - for( ; entry != NULL; entry = entry->next) { - fprintf(out, "\t%s", entry->symbol->string); - if(entry->value != NULL) { - fprintf(out, " = "); - print_expression(entry->value); - } - fprintf(out, ",\n"); + if(type->size != NULL) { + print_expression(type->size); + } + fputc(']', out); + intern_print_type_post(type->element_type, false); +} + +static void print_bitfield_type_post(const bitfield_type_t *type) +{ + fputs(" : ", out); + print_expression(type->size); + intern_print_type_post(type->base, false); +} + +void print_enum_definition(const declaration_t *declaration) +{ + fputs("{\n", out); + + change_indent(1); + + declaration_t *entry = declaration->next; + for( ; entry != NULL && entry->storage_class == STORAGE_CLASS_ENUM_ENTRY; + entry = entry->next) { + + print_indent(); + fprintf(out, "%s", entry->symbol->string); + if(entry->init.initializer != NULL) { + fprintf(out, " = "); + print_expression(entry->init.enum_value); } + fprintf(out, ",\n"); + } + + change_indent(-1); + print_indent(); + fputs("}", out); +} + +static void print_type_enum(const enum_type_t *type) +{ + print_type_qualifiers(type->type.qualifiers); + fputs("enum ", out); - fprintf(out, "} "); + declaration_t *declaration = type->declaration; + symbol_t *symbol = declaration->symbol; + if(symbol != NULL) { + fputs(symbol->string, out); + } else { + print_enum_definition(declaration); } } -static -void intern_print_type_pre(const type_t *type) +void print_compound_definition(const declaration_t *declaration) { - switch(type->type) { + fputs("{\n", out); + change_indent(1); + + declaration_t *iter = declaration->context.declarations; + for( ; iter != NULL; iter = iter->next) { + print_indent(); + print_declaration(iter); + fputc('\n', out); + } + + change_indent(-1); + print_indent(); + fputs("}", out); +} + +static void print_compound_type(const compound_type_t *type) +{ + print_type_qualifiers(type->type.qualifiers); + + if(type->type.kind == TYPE_COMPOUND_STRUCT) { + fputs("struct ", out); + } else { + assert(type->type.kind == TYPE_COMPOUND_UNION); + fputs("union ", out); + } + + declaration_t *declaration = type->declaration; + symbol_t *symbol = declaration->symbol; + if(symbol != NULL) { + fputs(symbol->string, out); + } else { + print_compound_definition(declaration); + } +} + +static void print_typedef_type_pre(const typedef_type_t *const type) +{ + print_type_qualifiers(type->type.qualifiers); + fputs(type->declaration->symbol->string, out); +} + +static void print_typeof_type_pre(const typeof_type_t *const type) +{ + fputs("typeof(", out); + if(type->expression != NULL) { + assert(type->typeof_type == NULL); + print_expression(type->expression); + } else { + print_type(type->typeof_type); + } + fputc(')', out); +} + +static void intern_print_type_pre(const type_t *const type, const bool top) +{ + switch(type->kind) { + case TYPE_ERROR: + fputs("", out); case TYPE_INVALID: - fputs("invalid", out); + fputs("", out); return; case TYPE_ENUM: - print_type_enum((const enum_type_t*) type); + print_type_enum(&type->enumt); return; case TYPE_ATOMIC: - print_atomic_type((const atomic_type_t*) type); + print_atomic_type(&type->atomic); return; case TYPE_COMPOUND_STRUCT: case TYPE_COMPOUND_UNION: - print_type_qualifiers(type->qualifiers); - if(((const compound_type_t*) type)->symbol != NULL) { - fprintf(out, "%s", ((const compound_type_t*) type)->symbol->string); - } + print_compound_type(&type->compound); return; case TYPE_BUILTIN: - fputs(((builtin_type_t*) type)->symbol->string, out); + fputs(type->builtin.symbol->string, out); return; - case TYPE_METHOD: - print_method_type_pre((const method_type_t*) type); + case TYPE_FUNCTION: + print_function_type_pre(&type->function, top); return; case TYPE_POINTER: - print_pointer_type_pre((const pointer_type_t*) type); + print_pointer_type_pre(&type->pointer); + return; + case TYPE_BITFIELD: + intern_print_type_pre(type->bitfield.base, top); + return; + case TYPE_ARRAY: + print_array_type_pre(&type->array); + return; + case TYPE_TYPEDEF: + print_typedef_type_pre(&type->typedeft); + return; + case TYPE_TYPEOF: + print_typeof_type_pre(&type->typeoft); return; } fputs("unknown", out); } -static -void intern_print_type_post(const type_t *type) +static void intern_print_type_post(const type_t *const type, const bool top) { - switch(type->type) { - case TYPE_METHOD: - print_method_type_post((const method_type_t*) type); + switch(type->kind) { + case TYPE_FUNCTION: + print_function_type_post(&type->function, NULL, top); return; case TYPE_POINTER: - print_pointer_type_post((const pointer_type_t*) type); + print_pointer_type_post(&type->pointer); return; + case TYPE_ARRAY: + print_array_type_post(&type->array); + return; + case TYPE_BITFIELD: + print_bitfield_type_post(&type->bitfield); + return; + case TYPE_ERROR: case TYPE_INVALID: case TYPE_ATOMIC: case TYPE_ENUM: case TYPE_COMPOUND_STRUCT: case TYPE_COMPOUND_UNION: case TYPE_BUILTIN: + case TYPE_TYPEOF: + case TYPE_TYPEDEF: break; } } -void print_type(const type_t *type, const symbol_t *symbol) +void print_type(const type_t *const type) +{ + print_type_ext(type, NULL, NULL); +} + +void print_type_ext(const type_t *const type, const symbol_t *symbol, + const context_t *context) { if(type == NULL) { fputs("nil type", out); return; } - intern_print_type_pre(type); + intern_print_type_pre(type, true); if(symbol != NULL) { fputc(' ', out); fputs(symbol->string, out); } - intern_print_type_post(type); + if(type->kind == TYPE_FUNCTION) { + print_function_type_post(&type->function, context, true); + } else { + intern_print_type_post(type, true); + } } -int type_valid(const type_t *type) +static size_t get_type_size(type_t *type) { - return type->type != TYPE_INVALID; + switch(type->kind) { + case TYPE_ATOMIC: return sizeof(atomic_type_t); + case TYPE_COMPOUND_STRUCT: + case TYPE_COMPOUND_UNION: return sizeof(compound_type_t); + case TYPE_ENUM: return sizeof(enum_type_t); + case TYPE_FUNCTION: return sizeof(function_type_t); + case TYPE_POINTER: return sizeof(pointer_type_t); + case TYPE_ARRAY: return sizeof(array_type_t); + case TYPE_BUILTIN: return sizeof(builtin_type_t); + case TYPE_TYPEDEF: return sizeof(typedef_type_t); + case TYPE_TYPEOF: return sizeof(typeof_type_t); + case TYPE_BITFIELD: return sizeof(bitfield_type_t); + case TYPE_ERROR: panic("error type found"); + case TYPE_INVALID: panic("invalid type found"); + } + panic("unknown type found"); +} + +/** + * duplicates a type + * note that this does not produce a deep copy! + */ +type_t *duplicate_type(type_t *type) +{ + size_t size = get_type_size(type); + + type_t *copy = obstack_alloc(type_obst, size); + memcpy(copy, type, size); + + return copy; +} + +type_t *get_unqualified_type(type_t *type) +{ + if(type->base.qualifiers == TYPE_QUALIFIER_NONE) + return type; + + type_t *unqualified_type = duplicate_type(type); + unqualified_type->base.qualifiers = TYPE_QUALIFIER_NONE; + + type_t *result = typehash_insert(unqualified_type); + if(result != unqualified_type) { + obstack_free(type_obst, unqualified_type); + } + + return result; +} + +bool type_valid(const type_t *type) +{ + return type->kind != TYPE_INVALID; } -int is_type_int(const type_t *type) +bool is_type_integer(const type_t *type) { - if(type->type != TYPE_ATOMIC) - return 0; + assert(!is_typeref(type)); + + if(type->kind == TYPE_ENUM) + return true; + + if(type->kind != TYPE_ATOMIC) + return false; - atomic_type_t *atomic_type = (atomic_type_t*) type; - switch(atomic_type->atype) { + switch(type->atomic.akind) { + case ATOMIC_TYPE_BOOL: case ATOMIC_TYPE_CHAR: case ATOMIC_TYPE_SCHAR: case ATOMIC_TYPE_UCHAR: @@ -241,18 +433,365 @@ int is_type_int(const type_t *type) case ATOMIC_TYPE_ULONG: case ATOMIC_TYPE_LONGLONG: case ATOMIC_TYPE_ULONGLONG: - return 1; + return true; default: - return 0; + return false; } } +bool is_type_floating(const type_t *type) +{ + assert(!is_typeref(type)); + + if(type->kind != TYPE_ATOMIC) + return false; + + switch(type->atomic.akind) { + case ATOMIC_TYPE_FLOAT: + case ATOMIC_TYPE_DOUBLE: + case ATOMIC_TYPE_LONG_DOUBLE: +#ifdef PROVIDE_COMPLEX + case ATOMIC_TYPE_FLOAT_COMPLEX: + case ATOMIC_TYPE_DOUBLE_COMPLEX: + case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX: + case ATOMIC_TYPE_FLOAT_IMAGINARY: + case ATOMIC_TYPE_DOUBLE_IMAGINARY: + case ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY: +#endif + return true; + default: + return false; + } +} + +bool is_type_signed(const type_t *type) +{ + assert(!is_typeref(type)); + + /* enum types are int for now */ + if(type->kind == TYPE_ENUM) + return true; + + if(type->kind != TYPE_ATOMIC) + return false; + + switch(type->atomic.akind) { + case ATOMIC_TYPE_CHAR: + case ATOMIC_TYPE_SCHAR: + case ATOMIC_TYPE_SHORT: + case ATOMIC_TYPE_INT: + case ATOMIC_TYPE_LONG: + case ATOMIC_TYPE_LONGLONG: + case ATOMIC_TYPE_FLOAT: + case ATOMIC_TYPE_DOUBLE: + case ATOMIC_TYPE_LONG_DOUBLE: +#ifdef PROVIDE_COMPLEX + case ATOMIC_TYPE_FLOAT_COMPLEX: + case ATOMIC_TYPE_DOUBLE_COMPLEX: + case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX: + case ATOMIC_TYPE_FLOAT_IMAGINARY: + case ATOMIC_TYPE_DOUBLE_IMAGINARY: + case ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY: +#endif + return true; + + case ATOMIC_TYPE_BOOL: + case ATOMIC_TYPE_UCHAR: + case ATOMIC_TYPE_USHORT: + case ATOMIC_TYPE_UINT: + case ATOMIC_TYPE_ULONG: + case ATOMIC_TYPE_ULONGLONG: + return false; + + case ATOMIC_TYPE_VOID: + case ATOMIC_TYPE_INVALID: + case ATOMIC_TYPE_LAST: + return false; + } + + panic("invalid atomic type found"); + return false; +} + +bool is_type_arithmetic(const type_t *type) +{ + assert(!is_typeref(type)); + + if(type->kind == TYPE_BITFIELD) + return true; + + if(is_type_integer(type) || is_type_floating(type)) + return true; + + return false; +} + +bool is_type_scalar(const type_t *type) +{ + assert(!is_typeref(type)); + + switch (type->kind) { + case TYPE_POINTER: return true; + case TYPE_BUILTIN: return is_type_scalar(type->builtin.real_type); + default: break; + } + + return is_type_arithmetic(type); +} + +/** + * Check if a given type is incomplete + */ +bool is_type_incomplete(const type_t *type) +{ + assert(!is_typeref(type)); + + switch(type->kind) { + case TYPE_COMPOUND_STRUCT: + case TYPE_COMPOUND_UNION: { + const compound_type_t *compound_type = &type->compound; + declaration_t *declaration = compound_type->declaration; + return !declaration->init.is_defined; + } + case TYPE_ENUM: { + const enum_type_t *enum_type = &type->enumt; + declaration_t *declaration = enum_type->declaration; + return !declaration->init.is_defined; + } + case TYPE_BITFIELD: + case TYPE_FUNCTION: + return true; + + case TYPE_ARRAY: + return type->array.size == NULL; + + case TYPE_ATOMIC: + return type->atomic.akind == ATOMIC_TYPE_VOID; + + case TYPE_POINTER: + case TYPE_BUILTIN: + case TYPE_ERROR: + return false; + + case TYPE_TYPEDEF: + case TYPE_TYPEOF: + panic("is_type_incomplete called without typerefs skipped"); + case TYPE_INVALID: + break; + } + + panic("invalid type found"); +} + +static bool function_types_compatible(const function_type_t *func1, + const function_type_t *func2) +{ + const type_t* const ret1 = skip_typeref(func1->return_type); + const type_t* const ret2 = skip_typeref(func2->return_type); + if (!types_compatible(ret1, ret2)) + return false; + + /* can parameters be compared? */ + if(func1->unspecified_parameters || func2->unspecified_parameters) + return true; + + if(func1->variadic != func2->variadic) + return false; + + /* TODO: handling of unspecified parameters not correct yet */ + + /* all argument types must be compatible */ + function_parameter_t *parameter1 = func1->parameters; + function_parameter_t *parameter2 = func2->parameters; + for( ; parameter1 != NULL && parameter2 != NULL; + parameter1 = parameter1->next, parameter2 = parameter2->next) { + type_t *parameter1_type = skip_typeref(parameter1->type); + type_t *parameter2_type = skip_typeref(parameter2->type); + + parameter1_type = get_unqualified_type(parameter1_type); + parameter2_type = get_unqualified_type(parameter2_type); + + if(!types_compatible(parameter1_type, parameter2_type)) + return false; + } + /* same number of arguments? */ + if(parameter1 != NULL || parameter2 != NULL) + return false; + + return true; +} + +static bool array_types_compatible(const array_type_t *array1, + const array_type_t *array2) +{ + type_t *element_type1 = skip_typeref(array1->element_type); + type_t *element_type2 = skip_typeref(array2->element_type); + if(!types_compatible(element_type1, element_type2)) + return false; + + if(array1->size != NULL && array2->size != NULL) { + /* TODO: check if size expression evaluate to the same value + * if they are constant */ + } + + return true; +} + +bool types_compatible(const type_t *type1, const type_t *type2) +{ + assert(!is_typeref(type1)); + assert(!is_typeref(type2)); + + /* shortcut: the same type is always compatible */ + if(type1 == type2) + return true; + + if(type1->base.qualifiers != type2->base.qualifiers) + return false; + if(type1->kind != type2->kind) + return false; + + switch(type1->kind) { + case TYPE_FUNCTION: + return function_types_compatible(&type1->function, &type2->function); + case TYPE_ATOMIC: + return type1->atomic.akind == type2->atomic.akind; + case TYPE_ARRAY: + return array_types_compatible(&type1->array, &type2->array); + + case TYPE_POINTER: { + const type_t *const to1 = skip_typeref(type1->pointer.points_to); + const type_t *const to2 = skip_typeref(type2->pointer.points_to); + return types_compatible(to1, to2); + } + + case TYPE_COMPOUND_STRUCT: + case TYPE_COMPOUND_UNION: + case TYPE_ENUM: + case TYPE_BUILTIN: + /* TODO: not implemented */ + break; + + case TYPE_BITFIELD: + /* not sure if this makes sense or is even needed, implement it if you + * really need it! */ + panic("type compatibility check for bitfield type"); + + case TYPE_ERROR: + /* Hmm, the error type should be compatible to all other types */ + return true; + case TYPE_INVALID: + panic("invalid type found in compatible types"); + case TYPE_TYPEDEF: + case TYPE_TYPEOF: + panic("typerefs not skipped in compatible types?!?"); + } + + /* TODO: incomplete */ + return false; +} + +bool pointers_compatible(const type_t *type1, const type_t *type2) +{ + assert(!is_typeref(type1)); + assert(!is_typeref(type2)); + + assert(type1->kind == TYPE_POINTER); + assert(type2->kind == TYPE_POINTER); + /* TODO */ + return true; +} + +/** + * Skip all typerefs and return the underlying type. + */ +type_t *skip_typeref(type_t *type) +{ + unsigned qualifiers = TYPE_QUALIFIER_NONE; + + while(true) { + switch(type->kind) { + case TYPE_ERROR: + return type; + case TYPE_TYPEDEF: { + qualifiers |= type->base.qualifiers; + const typedef_type_t *typedef_type = &type->typedeft; + if(typedef_type->resolved_type != NULL) { + type = typedef_type->resolved_type; + break; + } + type = typedef_type->declaration->type; + continue; + } + case TYPE_TYPEOF: { + const typeof_type_t *typeof_type = &type->typeoft; + if(typeof_type->typeof_type != NULL) { + type = typeof_type->typeof_type; + } else { + type = typeof_type->expression->base.datatype; + } + continue; + } + default: + break; + } + break; + } + + if (qualifiers != TYPE_QUALIFIER_NONE) { + type_t *const copy = duplicate_type(type); + copy->base.qualifiers |= qualifiers; + + type = typehash_insert(copy); + if (type != copy) { + obstack_free(type_obst, copy); + } + } + + return type; +} + + + +static type_t *identify_new_type(type_t *type) +{ + type_t *result = typehash_insert(type); + if(result != type) { + obstack_free(type_obst, type); + } + return result; +} + +type_t *make_atomic_type(atomic_type_kind_t atype, type_qualifiers_t qualifiers) +{ + type_t *type = obstack_alloc(type_obst, sizeof(atomic_type_t)); + memset(type, 0, sizeof(atomic_type_t)); + + type->kind = TYPE_ATOMIC; + type->base.qualifiers = qualifiers; + type->atomic.akind = atype; + + return identify_new_type(type); +} + +type_t *make_pointer_type(type_t *points_to, type_qualifiers_t qualifiers) +{ + type_t *type = obstack_alloc(type_obst, sizeof(pointer_type_t)); + memset(type, 0, sizeof(pointer_type_t)); + + type->kind = TYPE_POINTER; + type->base.qualifiers = qualifiers; + type->pointer.points_to = points_to; + + return identify_new_type(type); +} + static __attribute__((unused)) -void dbg_type(const type_t *type) +void dbg_type(type_t *type) { FILE *old_out = out; out = stderr; - print_type(type, NULL); + print_type(type); puts("\n"); fflush(stderr); out = old_out;