X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_t.h;h=d6131d5470bc2b438863a72f39f3fb2c254293a0;hb=b8df54059f5ceb0bb6c767aaaf94840dc0b38e25;hp=01e04c05eca0cdd6407d6624d515463bde259f1c;hpb=ab16d355c444f215cda89055c05606585c32a49f;p=cparser

diff --git a/type_t.h b/type_t.h
index 01e04c0..d6131d5 100644
--- a/type_t.h
+++ b/type_t.h
@@ -12,10 +12,11 @@
 #include "ast_t.h"
 #include "adt/obst.h"
 
-struct obstack *type_obst;
+extern struct obstack *type_obst;
 
 typedef enum {
 	TYPE_INVALID,
+	TYPE_ERROR,
 	TYPE_ATOMIC,
 	TYPE_COMPOUND_STRUCT,
 	TYPE_COMPOUND_UNION,
@@ -23,6 +24,7 @@ typedef enum {
 	TYPE_FUNCTION,
 	TYPE_POINTER,
 	TYPE_ARRAY,
+	TYPE_BITFIELD,
 	TYPE_BUILTIN,
 	TYPE_TYPEDEF,
 	TYPE_TYPEOF,
@@ -57,7 +59,7 @@ typedef enum {
 	ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY,
 #endif
 	ATOMIC_TYPE_LAST
-} atomic_type_type_t;
+} atomic_type_kind_t;
 
 typedef enum {
 	TYPE_QUALIFIER_NONE     = 0,
@@ -77,7 +79,7 @@ struct type_base_t {
 
 struct atomic_type_t {
 	type_base_t         type;
-	atomic_type_type_t  atype;
+	atomic_type_kind_t  akind;
 };
 
 struct builtin_type_t {
@@ -141,6 +143,12 @@ struct typeof_type_t {
 	type_t       *resolved_type;
 };
 
+struct bitfield_type_t {
+	type_base_t   type;
+	type_t       *base;
+	expression_t *size;
+};
+
 union type_t {
 	type_kind_t      kind;
 	type_base_t      base;
@@ -152,20 +160,21 @@ union type_t {
 	compound_type_t  compound;
 	enum_type_t      enumt;
 	typedef_type_t   typedeft;
+	bitfield_type_t  bitfield;
 	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 *duplicate_type(type_t *type);
+type_t *duplicate_type(const type_t *type);
 
 static inline bool is_typeref(const type_t *type)
 {
 	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));
 
@@ -173,7 +182,7 @@ static inline bool is_type_atomic(const type_t *type, atomic_type_type_t atype)
 		return false;
 	const atomic_type_t *atomic_type = &type->atomic;
 
-	return atomic_type->atype == atype;
+	return atomic_type->akind == atype;
 }
 
 static inline bool is_type_pointer(const type_t *type)