X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_hash.c;h=e6e487af6b03dcdbf180b6f89cd40be86ebc4327;hb=57d4768d80fc74e806f00b2e8e4e30125e638115;hp=78658bc705ec2500fc10d6c0efd7be87a8c20c14;hpb=2ef7b77e92bd93fa2e3d487b91a24f55d299cdd7;p=cparser

diff --git a/type_hash.c b/type_hash.c
index 78658bc..e6e487a 100644
--- a/type_hash.c
+++ b/type_hash.c
@@ -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);
@@ -121,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;
@@ -172,9 +142,6 @@ static unsigned hash_type(const type_t *type)
 	case TYPE_TYPEOF:
 		hash = hash_typeof_type(&type->typeoft);
 		break;
-	case TYPE_BITFIELD:
-		hash = hash_bitfield_type(&type->bitfield);
-		break;
 	}
 
 	unsigned some_prime = 99991;
@@ -189,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)
 {
@@ -297,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)
@@ -319,14 +265,10 @@ static bool types_equal(const type_t *type1, const type_t *type2)
 	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:
@@ -344,8 +286,6 @@ static bool types_equal(const type_t *type1, const type_t *type2)
 		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();