fix warnings, disable empty statement warning by default

[cparser] / type_hash.c

diff --git a/type_hash.c b/type_hash.c
index 344d458..4168dde 100644 (file)
--- a/type_hash.c
+++ b/type_hash.c
@@ -29,7 +29,7 @@ static unsigned hash_ptr(const void *ptr)
 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;
 }
@@ -77,6 +77,14 @@ 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);
+       result          ^= 27172145;
+
+       return result;
+}
+
 static unsigned hash_type(const type_t *type)
 {
        unsigned hash = 0;
@@ -85,6 +93,8 @@ static unsigned hash_type(const type_t *type)
        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(&type->atomic);
                break;
@@ -113,6 +123,9 @@ 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;
@@ -124,7 +137,7 @@ static unsigned hash_type(const type_t *type)
 static bool atomic_types_equal(const atomic_type_t *type1,
                                const atomic_type_t *type2)
 {
-       return type1->atype == type2->atype;
+       return type1->akind == type2->akind;
 }
 
 static bool function_types_equal(const function_type_t *type1,
@@ -168,11 +181,10 @@ static bool array_types_equal(const array_type_t *type1,
                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,
@@ -210,6 +222,15 @@ 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 != 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)
@@ -220,6 +241,9 @@ static bool types_equal(const type_t *type1, const type_t *type2)
                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:
@@ -241,6 +265,8 @@ 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();