projects
/
cparser
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix off-by-one error in error message.
[cparser]
/
type_hash.c
diff --git
a/type_hash.c
b/type_hash.c
index
bfb875c
..
046e6af
100644
(file)
--- a/
type_hash.c
+++ b/
type_hash.c
@@
-84,7
+84,7
@@
static unsigned hash_array_type(const array_type_t *type)
static unsigned hash_compound_type(const compound_type_t *type)
{
static unsigned hash_compound_type(const compound_type_t *type)
{
- return hash_ptr(type->
declaration
);
+ return hash_ptr(type->
compound
);
}
static unsigned hash_type(const type_t *type);
}
static unsigned hash_type(const type_t *type);
@@
-94,17
+94,19
@@
static unsigned hash_function_type(const function_type_t *type)
unsigned result = hash_ptr(type->return_type);
function_parameter_t *parameter = type->parameters;
unsigned result = hash_ptr(type->return_type);
function_parameter_t *parameter = type->parameters;
- while(parameter != NULL) {
+ while
(parameter != NULL) {
result ^= hash_ptr(parameter->type);
parameter = parameter->next;
}
result ^= hash_ptr(parameter->type);
parameter = parameter->next;
}
+ result += type->linkage;
+ result += type->calling_convention;
return result;
}
static unsigned hash_enum_type(const enum_type_t *type)
{
return result;
}
static unsigned hash_enum_type(const enum_type_t *type)
{
- return hash_ptr(type->
declaration
);
+ return hash_ptr(type->
enume
);
}
static unsigned hash_typeof_type(const typeof_type_t *type)
}
static unsigned hash_typeof_type(const typeof_type_t *type)
@@
-127,7
+129,7
@@
static unsigned hash_type(const type_t *type)
{
unsigned hash = 0;
{
unsigned hash = 0;
- switch(type->kind) {
+ switch
(type->kind) {
case TYPE_INVALID:
panic("internalizing void or invalid types not possible");
return 0;
case TYPE_INVALID:
panic("internalizing void or invalid types not possible");
return 0;
@@
-162,7
+164,7
@@
static unsigned hash_type(const type_t *type)
hash = hash_ptr(type->builtin.symbol);
break;
case TYPE_TYPEDEF:
hash = hash_ptr(type->builtin.symbol);
break;
case TYPE_TYPEDEF:
- hash = hash_ptr(type->typedeft.
declaration
);
+ hash = hash_ptr(type->typedeft.
typedefe
);
break;
case TYPE_TYPEOF:
hash = hash_typeof_type(&type->typeoft);
break;
case TYPE_TYPEOF:
hash = hash_typeof_type(&type->typeoft);
@@
-199,24
+201,28
@@
static bool imaginary_types_equal(const imaginary_type_t *type1,
static bool function_types_equal(const function_type_t *type1,
const function_type_t *type2)
{
static bool function_types_equal(const function_type_t *type1,
const function_type_t *type2)
{
- if(type1->return_type != type2->return_type)
+ if
(type1->return_type != type2->return_type)
return false;
return false;
- if(type1->variadic != type2->variadic)
+ if
(type1->variadic != type2->variadic)
return false;
return false;
- if(type1->unspecified_parameters != type2->unspecified_parameters)
+ if
(type1->unspecified_parameters != type2->unspecified_parameters)
return false;
return false;
- if(type1->kr_style_parameters != type2->kr_style_parameters)
+ if (type1->kr_style_parameters != type2->kr_style_parameters)
+ return false;
+ if (type1->linkage != type2->linkage)
+ return false;
+ if (type1->calling_convention != type2->calling_convention)
return false;
function_parameter_t *param1 = type1->parameters;
function_parameter_t *param2 = type2->parameters;
return false;
function_parameter_t *param1 = type1->parameters;
function_parameter_t *param2 = type2->parameters;
- while(param1 != NULL && param2 != NULL) {
- if(param1->type != param2->type)
+ while
(param1 != NULL && param2 != NULL) {
+ if
(param1->type != param2->type)
return false;
param1 = param1->next;
param2 = param2->next;
}
return false;
param1 = param1->next;
param2 = param2->next;
}
- if(param1 != NULL || param2 != NULL)
+ if
(param1 != NULL || param2 != NULL)
return false;
return true;
return false;
return true;
@@
-225,24
+231,25
@@
static bool function_types_equal(const function_type_t *type1,
static bool pointer_types_equal(const pointer_type_t *type1,
const pointer_type_t *type2)
{
static bool pointer_types_equal(const pointer_type_t *type1,
const pointer_type_t *type2)
{
- return type1->points_to == type2->points_to;
+ return type1->points_to == type2->points_to &&
+ type1->base_variable == type2->base_variable;
}
static bool array_types_equal(const array_type_t *type1,
const array_type_t *type2)
{
}
static bool array_types_equal(const array_type_t *type1,
const array_type_t *type2)
{
- if(type1->element_type != type2->element_type)
+ if
(type1->element_type != type2->element_type)
return false;
return false;
- if(type1->is_variable != type2->is_variable)
+ if
(type1->is_variable != type2->is_variable)
return false;
return false;
- if(type1->is_static != type2->is_static)
+ if
(type1->is_static != type2->is_static)
return false;
return false;
- if(type1->size_constant != type2->size_constant)
+ if
(type1->size_constant != type2->size_constant)
return false;
/* never identify vla types, because we need them for caching calculated
* sizes later in ast2firm */
return false;
/* never identify vla types, because we need them for caching calculated
* sizes later in ast2firm */
- if(type1->is_vla || type2->is_vla)
+ if
(type1->is_vla || type2->is_vla)
return false;
/* TODO: compare size expressions for equality... */
return false;
/* TODO: compare size expressions for equality... */
@@
-259,27
+266,27
@@
static bool builtin_types_equal(const builtin_type_t *type1,
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)
{
- return type1->
declaration == type2->declaration
;
+ return type1->
compound == type2->compound
;
}
static bool enum_types_equal(const enum_type_t *type1,
const enum_type_t *type2)
{
}
static bool enum_types_equal(const enum_type_t *type1,
const enum_type_t *type2)
{
- return type1->
declaration == type2->declaration
;
+ return type1->
enume == type2->enume
;
}
static bool typedef_types_equal(const typedef_type_t *type1,
const typedef_type_t *type2)
{
}
static bool typedef_types_equal(const typedef_type_t *type1,
const typedef_type_t *type2)
{
- return type1->
declaration == type2->declaration
;
+ return type1->
typedefe == type2->typedefe
;
}
static bool typeof_types_equal(const typeof_type_t *type1,
const typeof_type_t *type2)
{
}
static bool typeof_types_equal(const typeof_type_t *type1,
const typeof_type_t *type2)
{
- if(type1->expression != type2->expression)
+ if
(type1->expression != type2->expression)
return false;
return false;
- if(type1->typeof_type != type2->typeof_type)
+ if
(type1->typeof_type != type2->typeof_type)
return false;
return true;
return false;
return true;
@@
-288,7
+295,7
@@
static bool typeof_types_equal(const typeof_type_t *type1,
static bool bitfield_types_equal(const bitfield_type_t *type1,
const bitfield_type_t *type2)
{
static bool bitfield_types_equal(const bitfield_type_t *type1,
const bitfield_type_t *type2)
{
- if(type1->base_type != type2->base_type)
+ if
(type1->base_type != type2->base_type)
return false;
/* TODO: compare size expression */
return false;
return false;
/* TODO: compare size expression */
return false;
@@
-296,14
+303,16
@@
static bool bitfield_types_equal(const bitfield_type_t *type1,
static bool types_equal(const type_t *type1, const type_t *type2)
{
static bool types_equal(const type_t *type1, const type_t *type2)
{
- if(type1 == type2)
+ if
(type1 == type2)
return true;
return true;
- if(type1->kind != type2->kind)
+ if (type1->kind != type2->kind)
+ return false;
+ if (type1->base.qualifiers != type2->base.qualifiers)
return false;
return false;
- if
(type1->base.qualifiers != type2->base.qual
ifiers)
+ if
(type1->base.modifiers != type2->base.mod
ifiers)
return false;
return false;
- switch(type1->kind) {
+ switch
(type1->kind) {
case TYPE_ERROR:
/* Hmm, the error type is never equal */
return false;
case TYPE_ERROR:
/* Hmm, the error type is never equal */
return false;