projects
/
cparser
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove more unnecessary XXX_INVALID constants
[cparser]
/
type_hash.c
diff --git
a/type_hash.c
b/type_hash.c
index
ea88153
..
256cdd2
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
@@
-92,8
+92,6
@@
static unsigned hash_compound_type(const compound_type_t *type)
return hash_ptr(type->compound);
}
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);
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 ^= hash_ptr(parameter->type);
parameter = parameter->next;
}
+ result += type->modifiers;
result += type->linkage;
result += type->calling_convention;
result += type->linkage;
result += type->calling_convention;
@@
-122,21
+121,11
@@
static unsigned hash_typeof_type(const typeof_type_t *type)
return result;
}
return result;
}
-static unsigned hash_bitfield_type(const bitfield_type_t *type)
-{
- unsigned result = hash_ptr(type->base_type);
- result ^= 27172145;
-
- return result;
-}
-
static unsigned hash_type(const type_t *type)
{
unsigned hash = 0;
switch (type->kind) {
static unsigned hash_type(const type_t *type)
{
unsigned hash = 0;
switch (type->kind) {
- case TYPE_INVALID:
- panic("internalizing void or invalid types not possible");
case TYPE_ERROR:
return 0;
case TYPE_ATOMIC:
case TYPE_ERROR:
return 0;
case TYPE_ATOMIC:
@@
-167,18
+156,12
@@
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_TYPEOF:
hash = hash_typeof_type(&type->typeoft);
break;
case TYPE_TYPEDEF:
hash = hash_ptr(type->typedeft.typedefe);
break;
case TYPE_TYPEOF:
hash = hash_typeof_type(&type->typeoft);
break;
- case TYPE_BITFIELD:
- hash = hash_bitfield_type(&type->bitfield);
- break;
}
unsigned some_prime = 99991;
}
unsigned some_prime = 99991;
@@
-218,6
+201,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;
@@
-270,12
+255,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)
{
@@
-305,15
+284,6
@@
static bool typeof_types_equal(const typeof_type_t *type1,
return true;
}
return true;
}
-static bool bitfield_types_equal(const bitfield_type_t *type1,
- const bitfield_type_t *type2)
-{
- if (type1->base_type != type2->base_type)
- return false;
- /* TODO: compare size expression */
- return false;
-}
-
static bool types_equal(const type_t *type1, const type_t *type2)
{
if (type1 == type2)
static bool types_equal(const type_t *type1, const type_t *type2)
{
if (type1 == type2)
@@
-322,15
+292,11
@@
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:
/* Hmm, the error type is never equal */
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:
return atomic_types_equal(&type1->atomic, &type2->atomic);
case TYPE_COMPLEX:
case TYPE_ATOMIC:
return atomic_types_equal(&type1->atomic, &type2->atomic);
case TYPE_COMPLEX:
@@
-350,14
+316,10
@@
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:
return typedef_types_equal(&type1->typedeft, &type2->typedeft);
case TYPE_TYPEOF:
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();
}
abort();