projects
/
cparser
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
also support extern variable declarations in local scope
[cparser]
/
type_t.h
diff --git
a/type_t.h
b/type_t.h
index
e133d73
..
f745e4f
100644
(file)
--- a/
type_t.h
+++ b/
type_t.h
@@
-12,10
+12,11
@@
#include "ast_t.h"
#include "adt/obst.h"
#include "ast_t.h"
#include "adt/obst.h"
-struct obstack *type_obst;
+
extern
struct obstack *type_obst;
typedef enum {
TYPE_INVALID,
typedef enum {
TYPE_INVALID,
+ TYPE_ERROR,
TYPE_ATOMIC,
TYPE_COMPOUND_STRUCT,
TYPE_COMPOUND_UNION,
TYPE_ATOMIC,
TYPE_COMPOUND_STRUCT,
TYPE_COMPOUND_UNION,
@@
-23,10
+24,11
@@
typedef enum {
TYPE_FUNCTION,
TYPE_POINTER,
TYPE_ARRAY,
TYPE_FUNCTION,
TYPE_POINTER,
TYPE_ARRAY,
+ TYPE_BITFIELD,
TYPE_BUILTIN,
TYPE_TYPEDEF,
TYPE_TYPEOF,
TYPE_BUILTIN,
TYPE_TYPEDEF,
TYPE_TYPEOF,
-} type_
type
_t;
+} type_
kind
_t;
/* note that the constant values represent the rank of the types as defined
* in § 6.3.1 */
/* note that the constant values represent the rank of the types as defined
* in § 6.3.1 */
@@
-57,7
+59,7
@@
typedef enum {
ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY,
#endif
ATOMIC_TYPE_LAST
ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY,
#endif
ATOMIC_TYPE_LAST
-} atomic_type_
type
_t;
+} atomic_type_
kind
_t;
typedef enum {
TYPE_QUALIFIER_NONE = 0,
typedef enum {
TYPE_QUALIFIER_NONE = 0,
@@
-69,15
+71,16
@@
typedef enum {
typedef unsigned int type_qualifiers_t;
struct type_base_t {
typedef unsigned int type_qualifiers_t;
struct type_base_t {
- type_
type_t type
;
+ type_
kind_t kind
;
type_qualifiers_t qualifiers;
type_qualifiers_t qualifiers;
+ source_position_t source_position;
ir_type *firm_type;
};
struct atomic_type_t {
type_base_t type;
ir_type *firm_type;
};
struct atomic_type_t {
type_base_t type;
- atomic_type_
type_t atype
;
+ atomic_type_
kind_t akind
;
};
struct builtin_type_t {
};
struct builtin_type_t {
@@
-95,8
+98,9
@@
struct array_type_t {
type_base_t type;
type_t *element_type;
expression_t *size;
type_base_t type;
type_t *element_type;
expression_t *size;
- bool is_static;
- bool is_variable;
+ unsigned is_static : 1;
+ unsigned is_variable : 1;
+ unsigned has_implicit_size : 1;
};
struct function_parameter_t {
};
struct function_parameter_t {
@@
-115,7
+119,7
@@
struct function_type_t {
struct compound_type_t {
type_base_t type;
struct compound_type_t {
type_base_t type;
- /** the declaration of the compound type,
its context field
+ /** the declaration of the compound type,
the scope of the declaration
* contains the compound entries. */
declaration_t *declaration;
};
* contains the compound entries. */
declaration_t *declaration;
};
@@
-141,8
+145,14
@@
struct typeof_type_t {
type_t *resolved_type;
};
type_t *resolved_type;
};
+struct bitfield_type_t {
+ type_base_t type;
+ type_t *base;
+ expression_t *size;
+};
+
union type_t {
union type_t {
- type_
type_t type
;
+ type_
kind_t kind
;
type_base_t base;
atomic_type_t atomic;
builtin_type_t builtin;
type_base_t base;
atomic_type_t atomic;
builtin_type_t builtin;
@@
-152,53
+162,59
@@
union type_t {
compound_type_t compound;
enum_type_t enumt;
typedef_type_t typedeft;
compound_type_t compound;
enum_type_t enumt;
typedef_type_t typedeft;
+ bitfield_type_t bitfield;
typeof_type_t typeoft;
};
typeof_type_t typeoft;
};
-type_t *make_atomic_type(atomic_type_
type
_t type, type_qualifiers_t qualifiers);
+type_t *make_atomic_type(atomic_type_
kind
_t type, type_qualifiers_t qualifiers);
type_t *make_pointer_type(type_t *points_to, type_qualifiers_t qualifiers);
type_t *make_pointer_type(type_t *points_to, type_qualifiers_t qualifiers);
-type_t *duplicate_type(type_t *type);
+type_t *duplicate_type(
const
type_t *type);
static inline bool is_typeref(const type_t *type)
{
static inline bool is_typeref(const type_t *type)
{
- return type->
type == TYPE_TYPEDEF || type->type
== TYPE_TYPEOF;
+ return type->
kind == TYPE_TYPEDEF || type->kind
== TYPE_TYPEOF;
}
}
-static inline bool is_type_atomic(const type_t *type, atomic_type_
type
_t atype)
+static inline bool is_type_atomic(const type_t *type, atomic_type_
kind
_t atype)
{
assert(!is_typeref(type));
{
assert(!is_typeref(type));
- if(type->
type
!= TYPE_ATOMIC)
+ if(type->
kind
!= TYPE_ATOMIC)
return false;
const atomic_type_t *atomic_type = &type->atomic;
return false;
const atomic_type_t *atomic_type = &type->atomic;
- return atomic_type->a
type
== atype;
+ return atomic_type->a
kind
== atype;
}
static inline bool is_type_pointer(const type_t *type)
{
assert(!is_typeref(type));
}
static inline bool is_type_pointer(const type_t *type)
{
assert(!is_typeref(type));
- return type->
type
== TYPE_POINTER;
+ return type->
kind
== TYPE_POINTER;
}
static inline bool is_type_array(const type_t *type)
{
assert(!is_typeref(type));
}
static inline bool is_type_array(const type_t *type)
{
assert(!is_typeref(type));
- return type->
type
== TYPE_ARRAY;
+ return type->
kind
== TYPE_ARRAY;
}
static inline bool is_type_function(const type_t *type)
{
assert(!is_typeref(type));
}
static inline bool is_type_function(const type_t *type)
{
assert(!is_typeref(type));
- return type->
type
== TYPE_FUNCTION;
+ return type->
kind
== TYPE_FUNCTION;
}
static inline bool is_type_compound(const type_t *type)
{
assert(!is_typeref(type));
}
static inline bool is_type_compound(const type_t *type)
{
assert(!is_typeref(type));
- return type->type == TYPE_COMPOUND_STRUCT
- || type->type == TYPE_COMPOUND_UNION;
+ return type->kind == TYPE_COMPOUND_STRUCT
+ || type->kind == TYPE_COMPOUND_UNION;
+}
+
+static inline bool is_type_valid(const type_t *type)
+{
+ return type->kind != TYPE_ERROR;
}
#endif
}
#endif