X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_hash.c;h=be14de6c7dc1f78e03ca3fd1c6adb6d2ff65485f;hb=4e97fde80b82b546848d0e5efd7fed940922c793;hp=1b491afa24ea65fb77bc8f7b5e64373ef36b39b4;hpb=61bb8cbf62e7ca43ca99859159cc159bdb6c405c;p=cparser

diff --git a/type_hash.c b/type_hash.c
index 1b491af..be14de6 100644
--- a/type_hash.c
+++ b/type_hash.c
@@ -53,7 +53,7 @@ static unsigned hash_type(const 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);
 
 	function_parameter_t *parameter = type->parameters;
 	while(parameter != NULL) {
@@ -77,11 +77,19 @@ 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;
 
-	switch(type->type) {
+	switch(type->kind) {
 	case TYPE_INVALID:
 		panic("internalizing void or invalid types not possible");
 		return 0;
@@ -113,6 +121,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;
@@ -130,12 +141,14 @@ static bool atomic_types_equal(const atomic_type_t *type1,
 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;
 
 	function_parameter_t *param1 = type1->parameters;
 	function_parameter_t *param2 = type2->parameters;
@@ -166,11 +179,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,
@@ -208,16 +220,25 @@ 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)
 		return true;
-	if(type1->type != type2->type)
+	if(type1->kind != type2->kind)
 		return false;
 	if(type1->base.qualifiers != type2->base.qualifiers)
 		return false;
 
-	switch(type1->type) {
+	switch(type1->kind) {
 	case TYPE_INVALID:
 		return false;
 	case TYPE_ATOMIC:
@@ -239,6 +260,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();