X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_t.h;h=becc8a0df3f610bb28d18cb0c2f67f77b5fa79d8;hb=bafab880eb08fe9a867aae7e52fc290e09a915f2;hp=df39c628508c42969d3078ba30540960694e5514;hpb=10f7c1a8855a125dd841c2e4037f004ef1fec241;p=cparser

diff --git a/type_t.h b/type_t.h
index df39c62..becc8a0 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,7 +51,7 @@ typedef enum {
 	TYPE_TYPEOF,
 } type_kind_t;
 
-typedef enum {
+typedef enum type_modifier_t {
 	TYPE_MODIFIER_NONE              = 0,
 	TYPE_MODIFIER_TRANSPARENT_UNION = 1 << 0,
 } type_modifier_t;
@@ -59,10 +59,11 @@ typedef unsigned short type_modifiers_t;
 
 struct type_base_t {
 	type_kind_t       kind;
+	source_position_t source_position;
+	il_size_t         size;           /**< The size of this type. */
 	type_qualifiers_t qualifiers;
 	type_modifiers_t  modifiers;
-	unsigned char     alignment;      /**< The extra alignment of the type, 0 for default. */
-	source_position_t source_position;
+	il_alignment_t    alignment;      /**< The extra alignment of the type, 0 for default. */
 
 	ir_type          *firm_type;
 };
@@ -108,15 +109,31 @@ struct array_type_t {
 	unsigned      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.*/
 };
 
+/** 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;
+	type_t               *return_type;        /**< The return type. */
+	function_parameter_t *parameters;         /**< A list of the parameter types. */
+	cc_kind_t             calling_convention; /**< The specified calling convention. */
 	unsigned              variadic : 1;
 	unsigned              unspecified_parameters : 1;
 	unsigned              kr_style_parameters : 1;
@@ -124,6 +141,7 @@ struct function_type_t {
 
 struct compound_type_t {
 	type_base_t    base;
+	unsigned       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;
@@ -153,7 +171,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 {
@@ -243,6 +262,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;
 }