X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_hash.c;h=e6e487af6b03dcdbf180b6f89cd40be86ebc4327;hb=a42bc7a9bc2373001f03fee2c33de5b57b8a8143;hp=96354888029db961d865241f710e035c54b36823;hpb=2fec0452add8a8055bca5332372572e40642b4fa;p=cparser

diff --git a/type_hash.c b/type_hash.c
index 9635488..e6e487a 100644
--- a/type_hash.c
+++ b/type_hash.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -56,22 +56,6 @@ static unsigned hash_atomic_type(const atomic_type_t *type)
 	return result;
 }
 
-static unsigned hash_complex_type(const complex_type_t *type)
-{
-	unsigned some_prime = 27644437;
-	unsigned result     = type->akind * some_prime;
-
-	return result;
-}
-
-static unsigned hash_imaginary_type(const imaginary_type_t *type)
-{
-	unsigned some_prime = 27644437;
-	unsigned result     = type->akind * some_prime;
-
-	return result;
-}
-
 static unsigned hash_pointer_type(const pointer_type_t *type)
 {
 	return hash_ptr(type->points_to) ^ hash_ptr(type->base_variable);
@@ -101,6 +85,7 @@ static unsigned hash_function_type(const function_type_t *type)
 		result   ^= hash_ptr(parameter->type);
 		parameter = parameter->next;
 	}
+	result += type->modifiers;
 	result += type->linkage;
 	result += type->calling_convention;
 
@@ -120,32 +105,18 @@ static unsigned hash_typeof_type(const typeof_type_t *type)
 	return result;
 }
 
-static unsigned hash_bitfield_type(const bitfield_type_t *type)
-{
-	unsigned result  = hash_ptr(type->base_type);
-	result          ^= 27172145;
-
-	return result;
-}
-
 static unsigned hash_type(const type_t *type)
 {
 	unsigned hash = 0;
 
 	switch (type->kind) {
-	case TYPE_INVALID:
-		panic("internalizing void or invalid types not possible");
 	case TYPE_ERROR:
 		return 0;
+	case TYPE_IMAGINARY:
+	case TYPE_COMPLEX:
 	case TYPE_ATOMIC:
 		hash = hash_atomic_type(&type->atomic);
 		break;
-	case TYPE_COMPLEX:
-		hash = hash_complex_type(&type->complex);
-		break;
-	case TYPE_IMAGINARY:
-		hash = hash_imaginary_type(&type->imaginary);
-		break;
 	case TYPE_ENUM:
 		hash = hash_enum_type(&type->enumt);
 		break;
@@ -165,18 +136,12 @@ static unsigned hash_type(const type_t *type)
 	case TYPE_ARRAY:
 		hash = hash_array_type(&type->array);
 		break;
-	case TYPE_BUILTIN:
-		hash = hash_ptr(type->builtin.symbol);
-		break;
 	case TYPE_TYPEDEF:
 		hash = hash_ptr(type->typedeft.typedefe);
 		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;
@@ -191,18 +156,6 @@ static bool atomic_types_equal(const atomic_type_t *type1,
 	return type1->akind == type2->akind;
 }
 
-static bool complex_types_equal(const complex_type_t *type1,
-							    const complex_type_t *type2)
-{
-	return type1->akind == type2->akind;
-}
-
-static bool imaginary_types_equal(const imaginary_type_t *type1,
-							      const imaginary_type_t *type2)
-{
-	return type1->akind == type2->akind;
-}
-
 static bool function_types_equal(const function_type_t *type1,
                                  const function_type_t *type2)
 {
@@ -216,6 +169,8 @@ static bool function_types_equal(const function_type_t *type1,
 		return false;
 	if (type1->linkage != type2->linkage)
 		return false;
+	if (type1->modifiers != type2->modifiers)
+		return false;
 	if (type1->calling_convention != type2->calling_convention)
 		return false;
 
@@ -268,12 +223,6 @@ static bool array_types_equal(const array_type_t *type1,
 	return false;
 }
 
-static bool builtin_types_equal(const builtin_type_t *type1,
-                                const builtin_type_t *type2)
-{
-	return type1->symbol == type2->symbol;
-}
-
 static bool compound_types_equal(const compound_type_t *type1,
                                  const compound_type_t *type2)
 {
@@ -303,15 +252,6 @@ static bool typeof_types_equal(const typeof_type_t *type1,
 	return true;
 }
 
-static bool bitfield_types_equal(const bitfield_type_t *type1,
-                                 const bitfield_type_t *type2)
-{
-	if (type1->base_type != type2->base_type)
-		return false;
-	/* TODO: compare size expression */
-	return false;
-}
-
 static bool types_equal(const type_t *type1, const type_t *type2)
 {
 	if (type1 == type2)
@@ -320,21 +260,15 @@ static bool types_equal(const type_t *type1, const type_t *type2)
 		return false;
 	if (type1->base.qualifiers != type2->base.qualifiers)
 		return false;
-	if (type1->base.modifiers != type2->base.modifiers)
-		return false;
 
 	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(&type1->atomic, &type2->atomic);
-	case TYPE_COMPLEX:
-		return complex_types_equal(&type1->complex, &type2->complex);
 	case TYPE_IMAGINARY:
-		return imaginary_types_equal(&type1->imaginary, &type2->imaginary);
+	case TYPE_COMPLEX:
+		return atomic_types_equal(&type1->atomic, &type2->atomic);
 	case TYPE_ENUM:
 		return enum_types_equal(&type1->enumt, &type2->enumt);
 	case TYPE_COMPOUND_STRUCT:
@@ -348,14 +282,10 @@ static bool types_equal(const type_t *type1, const type_t *type2)
 		return reference_types_equal(&type1->reference, &type2->reference);
 	case TYPE_ARRAY:
 		return array_types_equal(&type1->array, &type2->array);
-	case TYPE_BUILTIN:
-		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();