projects
/
cparser
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Consistently use PUSH_PARENT()/POP_PARENT().
[cparser]
/
type_hash.c
diff --git
a/type_hash.c
b/type_hash.c
index
9635488
..
78658bc
100644
(file)
--- a/
type_hash.c
+++ b/
type_hash.c
@@
-1,6
+1,6
@@
/*
* This file is part of cparser.
/*
* This file is part of cparser.
- * Copyright (C) 2007-200
8
Matthias Braun <matze@braunis.de>
+ * Copyright (C) 2007-200
9
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
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@
-101,6
+101,7
@@
static unsigned hash_function_type(const function_type_t *type)
result ^= hash_ptr(parameter->type);
parameter = parameter->next;
}
result ^= hash_ptr(parameter->type);
parameter = parameter->next;
}
+ result += type->modifiers;
result += type->linkage;
result += type->calling_convention;
result += type->linkage;
result += type->calling_convention;
@@
-165,9
+166,6
@@
static unsigned hash_type(const type_t *type)
case TYPE_ARRAY:
hash = hash_array_type(&type->array);
break;
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_TYPEDEF:
hash = hash_ptr(type->typedeft.typedefe);
break;
@@
-216,6
+214,8
@@
static bool function_types_equal(const function_type_t *type1,
return false;
if (type1->linkage != type2->linkage)
return false;
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;
if (type1->calling_convention != type2->calling_convention)
return false;
@@
-268,12
+268,6
@@
static bool array_types_equal(const array_type_t *type1,
return false;
}
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)
{
static bool compound_types_equal(const compound_type_t *type1,
const compound_type_t *type2)
{
@@
-320,8
+314,6
@@
static bool types_equal(const type_t *type1, const type_t *type2)
return false;
if (type1->base.qualifiers != type2->base.qualifiers)
return false;
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:
switch (type1->kind) {
case TYPE_ERROR:
@@
-348,8
+340,6
@@
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);
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:
case TYPE_TYPEOF:
return typeof_types_equal(&type1->typeoft, &type2->typeoft);
case TYPE_TYPEDEF: