X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_t.h;h=a8f07fce49d6d87f1f1a490c1838dcf82d724cfe;hb=a6f95613c2bf85acee264e07d1efb3887cec029d;hp=f85e9d18659b41affff52cf22a8b768f60e39168;hpb=f4ba96ac16e62370ded3eb1ee80f4ee39cdddbaa;p=cparser

diff --git a/type_t.h b/type_t.h
index f85e9d1..a8f07fc 100644
--- a/type_t.h
+++ b/type_t.h
@@ -33,7 +33,7 @@
 
 extern struct obstack *type_obst;
 
-typedef enum {
+typedef enum type_kind_t {
 	TYPE_INVALID,
 	TYPE_ERROR,
 	TYPE_ATOMIC,
@@ -51,26 +51,18 @@ typedef enum {
 	TYPE_TYPEOF,
 } type_kind_t;
 
-typedef enum {
-	TYPE_QUALIFIER_NONE     = 0,
-	TYPE_QUALIFIER_CONST    = 1 << 0,
-	TYPE_QUALIFIER_RESTRICT = 1 << 1,
-	TYPE_QUALIFIER_VOLATILE = 1 << 2,
-	/* microsoft extended qualifiers */
-	TYPE_QUALIFIER_W64      = 1 << 3,
-	TYPE_QUALIFIER_PTR32    = 1 << 4,
-	TYPE_QUALIFIER_PTR64    = 1 << 5,
-	TYPE_QUALIFIER_SPTR     = 1 << 6,
-	TYPE_QUALIFIER_UPTR     = 1 << 7,
-} type_qualifier_t;
-
-typedef unsigned int type_qualifiers_t;
+typedef enum type_modifier_t {
+	TYPE_MODIFIER_NONE              = 0,
+	TYPE_MODIFIER_TRANSPARENT_UNION = 1 << 0,
+} type_modifier_t;
+typedef unsigned short type_modifiers_t;
 
 struct type_base_t {
 	type_kind_t       kind;
+	il_size_t         size;           /**< The size of this type. */
 	type_qualifiers_t qualifiers;
-	unsigned char     alignment;      /**< The extra alignment of the type, 0 for default. */
-	source_position_t source_position;
+	type_modifiers_t  modifiers;
+	il_alignment_t    alignment;      /**< The extra alignment of the type, 0 for default. */
 
 	ir_type          *firm_type;
 };
@@ -109,46 +101,71 @@ struct array_type_t {
 
 	ir_node      *size_node; /**< used by ast2firm phase */
 
-	unsigned      is_static         : 1; /**< a [static] type */
-	unsigned      is_variable       : 1; /**< a [*] type */
-	unsigned      has_implicit_size : 1;
-	unsigned      size_constant     : 1; /**< size expression is constant */
-	unsigned      is_vla            : 1; /**< it's a variable length array */
+	bool          is_static         : 1; /**< a [static] type */
+	bool          is_variable       : 1; /**< a [*] type */
+	bool          has_implicit_size : 1;
+	bool          size_constant     : 1; /**< size expression is constant */
+	bool          is_vla            : 1; /**< it's a variable length array */
 };
 
+/**
+ * An entry in the parameter list of a function type.
+ */
 struct function_parameter_t {
-	type_t               *type;
-	function_parameter_t *next;
+	type_t               *type;  /**< The parameter type. */
+	function_parameter_t *next;  /**< Points to the next type inthe parameter list.*/
 };
 
+/** Linkage specifications. */
+typedef enum linkage_kind_t {
+	LINKAGE_INVALID,
+	LINKAGE_C,       /**< C linkage. */
+	LINKAGE_CXX      /**< C++ linkage. */
+} linkage_kind_t;
+
+/** Calling conventions. */
+typedef enum cc_kind_t {
+	CC_DEFAULT,      /**< default calling convention. */
+	CC_CDECL,        /**< cdecl calling convention. */
+	CC_STDCALL,      /**< stdcall calling convention. */
+	CC_FASTCALL,     /**< fastcall calling convention. */
+	CC_THISCALL      /**< thiscall calling convention. */
+} cc_kind_t;
+
+/**
+ * A function type.
+ */
 struct function_type_t {
 	type_base_t           base;
-	type_t               *return_type;
-	function_parameter_t *parameters;
-	unsigned              variadic : 1;
-	unsigned              unspecified_parameters : 1;
-	unsigned              kr_style_parameters : 1;
+	type_t               *return_type;        /**< The return type. */
+	function_parameter_t *parameters;         /**< A list of the parameter types. */
+	linkage_kind_t        linkage;
+	cc_kind_t             calling_convention; /**< The specified calling convention. */
+	bool                  variadic : 1;
+	bool                  unspecified_parameters : 1;
+	bool                  kr_style_parameters : 1;
 };
 
 struct compound_type_t {
-	type_base_t    base;
+	type_base_t  base;
+	bool         packed : 1; /**< Set if packed was specified. */
 	/** the declaration of the compound type, the scope of the declaration
 	 *  contains the compound entries. */
-	declaration_t *declaration;
+	compound_t  *compound;
 };
 
 struct enum_type_t {
-	type_base_t    base;
-	/** the declaration of the enum type. You can find the enum entries by
-	 *  walking the declaration->next list until you don't find
-	 *  STORAGE_CLASS_ENUM_ENTRY declarations anymore */
-	declaration_t *declaration;
+	type_base_t  base;
+	/** the enum entity. You can find the enum entries by walking the
+	 *  enum->base.next list until you don't find ENTITY_ENUM_VALUE entities
+	 *  anymore */
+	enum_t      *enume;
 };
 
 struct typedef_type_t {
-	type_base_t    base;
-	declaration_t *declaration;
-	type_t        *resolved_type;
+	type_base_t  base;
+	typedef_t   *typedefe;
+	type_t      *resolved_type;
 };
 
 struct typeof_type_t {
@@ -161,7 +178,8 @@ struct typeof_type_t {
 struct bitfield_type_t {
 	type_base_t   base;
 	type_t       *base_type;
-	expression_t *size;
+	expression_t *size_expression; /**< The expression for the bit size. */
+	il_size_t     bit_size;        /**< Size of this bitfield in bits. */
 };
 
 union type_t {
@@ -251,6 +269,7 @@ static inline bool is_type_compound(const type_t *type)
 
 static inline bool is_type_valid(const type_t *type)
 {
+	assert(!is_typeref(type));
 	return type->kind != TYPE_ERROR;
 }