static unsigned hash_atomic_type(const atomic_type_t *type)
{
unsigned some_prime = 27644437;
- unsigned result = type->atype * some_prime;
+ unsigned result = type->akind * some_prime;
return result;
}
static unsigned hash_compound_type(const compound_type_t *type)
{
- unsigned result = hash_ptr(type->symbol);
-
- return result;
+ return hash_ptr(type->declaration);
}
static unsigned hash_type(const type_t *type);
-static unsigned hash_method_type(const method_type_t *type)
+static unsigned hash_function_type(const function_type_t *type)
{
- unsigned result = hash_ptr(type->result_type);
+ unsigned result = hash_ptr(type->return_type);
- method_parameter_t *parameter = type->parameters;
+ function_parameter_t *parameter = type->parameters;
while(parameter != NULL) {
result ^= hash_ptr(parameter->type);
parameter = parameter->next;
static unsigned hash_enum_type(const enum_type_t *type)
{
- unsigned result = hash_ptr(type->symbol);
+ return hash_ptr(type->declaration);
+}
+
+static unsigned hash_typeof_type(const typeof_type_t *type)
+{
+ unsigned result = hash_ptr(type->expression);
+ result ^= hash_ptr(type->typeof_type);
+
+ return result;
+}
+
+static unsigned hash_bitfield_type(const bitfield_type_t *type)
+{
+ unsigned result = hash_ptr(type->base);
+ result ^= 27172145;
return result;
}
static unsigned hash_type(const type_t *type)
{
- unsigned hash;
+ unsigned hash = 0;
- switch(type->type) {
+ switch(type->kind) {
case TYPE_INVALID:
panic("internalizing void or invalid types not possible");
return 0;
+ case TYPE_ERROR:
+ return 0;
case TYPE_ATOMIC:
- hash = hash_atomic_type((const atomic_type_t*) type);
+ hash = hash_atomic_type(&type->atomic);
break;
case TYPE_ENUM:
- hash = hash_enum_type((const enum_type_t*) type);
+ hash = hash_enum_type(&type->enumt);
break;
case TYPE_COMPOUND_STRUCT:
case TYPE_COMPOUND_UNION:
- hash = hash_compound_type((const compound_type_t*) type);
+ hash = hash_compound_type(&type->compound);
break;
- case TYPE_METHOD:
- hash = hash_method_type((const method_type_t*) type);
+ case TYPE_FUNCTION:
+ hash = hash_function_type(&type->function);
break;
case TYPE_POINTER:
- hash = hash_pointer_type((const pointer_type_t*) type);
+ hash = hash_pointer_type(&type->pointer);
break;
case TYPE_ARRAY:
- hash = hash_array_type((const array_type_t*) type);
+ hash = hash_array_type(&type->array);
break;
case TYPE_BUILTIN:
- hash = hash_ptr(((const builtin_type_t*) type)->symbol);
+ hash = hash_ptr(type->builtin.symbol);
+ break;
+ case TYPE_TYPEDEF:
+ hash = hash_ptr(type->typedeft.declaration);
+ break;
+ case TYPE_TYPEOF:
+ hash = hash_typeof_type(&type->typeoft);
+ break;
+ case TYPE_BITFIELD:
+ hash = hash_bitfield_type(&type->bitfield);
break;
}
unsigned some_prime = 99991;
- hash ^= some_prime * type->qualifiers;
+ hash ^= some_prime * type->base.qualifiers;
return hash;
}
static bool atomic_types_equal(const atomic_type_t *type1,
const atomic_type_t *type2)
{
- return type1->atype == type2->atype;
-}
-
-static bool compound_types_equal(const compound_type_t *type1,
- const compound_type_t *type2)
-{
- if(type1->type.type != type2->type.type)
- return false;
- if(type1->symbol != type2->symbol)
- return false;
-
- /* anonymous types? */
- if(type1->symbol == NULL) {
- /* previous tests should already have checked for this */
- assert(type1 != type2);
- /* anonymous types are only equal if they are the very same type */
- return false;
- }
-
- /* non-anonymous types with same symbol are equal */
- return true;
-}
-
-static bool enum_types_equal(const enum_type_t *type1, const enum_type_t *type2)
-{
- if(type1->symbol != type2->symbol)
- return false;
-
- /* anonymous types? */
- if(type1->symbol == NULL) {
- /* previous tests should already have checked for this */
- assert(type1 != type2);
- /* 2 anonymous enums are never equal */
- return false;
- }
-
- /* non-anonymous types with same symbol are equal */
- return true;
+ return type1->akind == type2->akind;
}
-static bool method_types_equal(const method_type_t *type1,
- const method_type_t *type2)
+static bool function_types_equal(const function_type_t *type1,
+ const function_type_t *type2)
{
- if(type1->result_type != type2->result_type)
+ if(type1->return_type != type2->return_type)
return false;
if(type1->variadic != type2->variadic)
return false;
if(type1->unspecified_parameters != type2->unspecified_parameters)
return false;
+ if(type1->kr_style_parameters != type2->kr_style_parameters)
+ return false;
- method_parameter_t *param1 = type1->parameters;
- method_parameter_t *param2 = type2->parameters;
+ function_parameter_t *param1 = type1->parameters;
+ function_parameter_t *param2 = type2->parameters;
while(param1 != NULL && param2 != NULL) {
if(param1->type != param2->type)
return false;
return false;
if(type1->is_static != type2->is_static)
return false;
- /* TODO: compare expressions for equality... */
- if(type1->size != type2->size)
- return false;
- return true;
+ /* TODO: compare size expressions for equality... */
+
+ return false;
}
static bool builtin_types_equal(const builtin_type_t *type1,
return type1->symbol == type2->symbol;
}
+static bool compound_types_equal(const compound_type_t *type1,
+ const compound_type_t *type2)
+{
+ return type1->declaration == type2->declaration;
+}
+
+static bool enum_types_equal(const enum_type_t *type1,
+ const enum_type_t *type2)
+{
+ return type1->declaration == type2->declaration;
+}
+
+static bool typedef_types_equal(const typedef_type_t *type1,
+ const typedef_type_t *type2)
+{
+ return type1->declaration == type2->declaration;
+}
+
+static bool typeof_types_equal(const typeof_type_t *type1,
+ const typeof_type_t *type2)
+{
+ if(type1->expression != type2->expression)
+ return false;
+ if(type1->typeof_type != type2->typeof_type)
+ return false;
+
+ return true;
+}
+
+static bool bitfield_types_equal(const bitfield_type_t *type1,
+ const bitfield_type_t *type2)
+{
+ if(type1->base != type2->base)
+ return false;
+ /* TODO: compare size expression */
+ return false;
+}
+
static bool types_equal(const type_t *type1, const type_t *type2)
{
if(type1 == type2)
return true;
- if(type1->type != type2->type)
+ if(type1->kind != type2->kind)
return false;
- if(type1->qualifiers != type2->qualifiers)
+ if(type1->base.qualifiers != type2->base.qualifiers)
return false;
- switch(type1->type) {
+ switch(type1->kind) {
+ case TYPE_ERROR:
+ /* Hmm, the error type is never equal */
+ return false;
case TYPE_INVALID:
return false;
case TYPE_ATOMIC:
- return atomic_types_equal((const atomic_type_t*) type1,
- (const atomic_type_t*) type2);
+ return atomic_types_equal(&type1->atomic, &type2->atomic);
+ case TYPE_ENUM:
+ return enum_types_equal(&type1->enumt, &type2->enumt);
case TYPE_COMPOUND_STRUCT:
case TYPE_COMPOUND_UNION:
- return compound_types_equal((const compound_type_t*) type1,
- (const compound_type_t*) type2);
- case TYPE_ENUM:
- return enum_types_equal((const enum_type_t*) type1,
- (const enum_type_t*) type2);
- case TYPE_METHOD:
- return method_types_equal((const method_type_t*) type1,
- (const method_type_t*) type2);
+ return compound_types_equal(&type1->compound, &type2->compound);
+ case TYPE_FUNCTION:
+ return function_types_equal(&type1->function, &type2->function);
case TYPE_POINTER:
- return pointer_types_equal((const pointer_type_t*) type1,
- (const pointer_type_t*) type2);
+ return pointer_types_equal(&type1->pointer, &type2->pointer);
case TYPE_ARRAY:
- return array_types_equal((const array_type_t*) type1,
- (const array_type_t*) type2);
+ return array_types_equal(&type1->array, &type2->array);
case TYPE_BUILTIN:
- return builtin_types_equal((const builtin_type_t*) type1,
- (const builtin_type_t*) type2);
+ return builtin_types_equal(&type1->builtin, &type2->builtin);
+ case TYPE_TYPEOF:
+ return typeof_types_equal(&type1->typeoft, &type2->typeoft);
+ case TYPE_TYPEDEF:
+ return typedef_types_equal(&type1->typedeft, &type2->typedeft);
+ case TYPE_BITFIELD:
+ return bitfield_types_equal(&type1->bitfield, &type2->bitfield);
}
abort();
projects / cparser / blobdiff