X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=type_hash.c;h=369c76a158df310060c9e2fe7bffe99f68118362;hb=f68de168c86fb6d99531cfd6cfdb45553c10d1ec;hp=aa5aa210c2a30b1b60a2376d079b22abfc458fe4;hpb=4599bf70900fbc4c5bf49c326ddb90bb48f346ec;p=cparser

diff --git a/type_hash.c b/type_hash.c
index aa5aa21..369c76a 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
@@ -74,7 +74,7 @@ static unsigned hash_imaginary_type(const imaginary_type_t *type)
 
 static unsigned hash_pointer_type(const pointer_type_t *type)
 {
-	return hash_ptr(type->points_to);
+	return hash_ptr(type->points_to) ^ hash_ptr(type->base_variable);
 }
 
 static unsigned hash_reference_type(const reference_type_t *type)
@@ -92,8 +92,6 @@ static unsigned hash_compound_type(const compound_type_t *type)
 	return hash_ptr(type->compound);
 }
 
-static unsigned hash_type(const type_t *type);
-
 static unsigned hash_function_type(const function_type_t *type)
 {
 	unsigned result = hash_ptr(type->return_type);
@@ -103,6 +101,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;
 
@@ -137,7 +136,6 @@ static unsigned hash_type(const type_t *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:
@@ -219,6 +217,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;
 
@@ -323,8 +323,6 @@ 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: