X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_t.h;h=e72dd38ca527819489058a430b801680a1b34be4;hb=d70f5307ecc25394fc2da35bf4167fea5ac4b9ec;hp=e133d730837f8b0582cb3326a25242bde530fb5e;hpb=170b64675d23eb67cace9bcde1ea107fa908fbc4;p=cparser

diff --git a/type_t.h b/type_t.h
index e133d73..e72dd38 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,10 +24,11 @@ typedef enum {
 	TYPE_FUNCTION,
 	TYPE_POINTER,
 	TYPE_ARRAY,
+	TYPE_BITFIELD,
 	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 */
@@ -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,
@@ -69,15 +71,16 @@ typedef enum {
 typedef unsigned int type_qualifiers_t;
 
 struct type_base_t {
-	type_type_t       type;
+	type_kind_t       kind;
 	type_qualifiers_t qualifiers;
+	source_position_t source_position;
 
 	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 {
@@ -94,9 +97,12 @@ struct pointer_type_t {
 struct array_type_t {
 	type_base_t   type;
 	type_t       *element_type;
-	expression_t *size;
-	bool          is_static;
-	bool          is_variable;
+	expression_t *size_expression;
+	size_t        size;
+	unsigned      is_static         : 1;
+	unsigned      is_variable       : 1;
+	unsigned      has_implicit_size : 1;
+	unsigned      size_constant     : 1;
 };
 
 struct function_parameter_t {
@@ -115,7 +121,7 @@ struct function_type_t {
 
 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;
 };
@@ -141,8 +147,14 @@ 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_type_t      type;
+	type_kind_t      kind;
 	type_base_t      base;
 	atomic_type_t    atomic;
 	builtin_type_t   builtin;
@@ -152,53 +164,77 @@ 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->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));
 
-	if(type->type != TYPE_ATOMIC)
+	if(type->kind != TYPE_ATOMIC)
 		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)
 {
 	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));
-	return type->type == TYPE_ARRAY;
+	return type->kind == TYPE_ARRAY;
 }
 
 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_union(const type_t *type)
+{
+	assert(!is_typeref(type));
+	return type->kind == TYPE_COMPOUND_UNION;
+}
+
+static inline bool is_type_struct(const type_t *type)
+{
+	assert(!is_typeref(type));
+	return type->kind == TYPE_COMPOUND_STRUCT;
+}
+
+static inline bool is_type_builtin(const type_t *type)
+{
+	assert(!is_typeref(type));
+	return type->kind == TYPE_BUILTIN;
 }
 
 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