X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_t.h;h=894270d058e00e287e9c2fe758f9c809e6f85334;hb=8f50e4997976bf4942a75b96ec8489edd4202203;hp=2824b96dc66879c3616a2884e72af7b24a2a56e0;hpb=35454a2b2dff8ce41e486848992e1289ea7c0a10;p=cparser

diff --git a/type_t.h b/type_t.h
index 2824b96..894270d 100644
--- a/type_t.h
+++ b/type_t.h
@@ -33,10 +33,12 @@
 
 extern struct obstack *type_obst;
 
-typedef enum {
+typedef enum type_kind_t {
 	TYPE_INVALID,
 	TYPE_ERROR,
 	TYPE_ATOMIC,
+	TYPE_COMPLEX,
+	TYPE_IMAGINARY,
 	TYPE_COMPOUND_STRUCT,
 	TYPE_COMPOUND_UNION,
 	TYPE_ENUM,
@@ -49,48 +51,51 @@ 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;
-	type_qualifiers_t qualifiers;
-	unsigned char     alignment;      /**< The extra alignment of the type, 0 for default. */
 	source_position_t source_position;
+	il_size_t         size;           /**< The size of this type. */
+	type_qualifiers_t qualifiers;
+	type_modifiers_t  modifiers;
+	il_alignment_t    alignment;      /**< The extra alignment of the type, 0 for default. */
 
 	ir_type          *firm_type;
 };
 
 struct atomic_type_t {
-	type_base_t         type;
+	type_base_t         base;
+	atomic_type_kind_t  akind;
+};
+
+struct complex_type_t {
+	type_base_t         base;
+	atomic_type_kind_t  akind;
+};
+
+struct imaginary_type_t {
+	type_base_t         base;
 	atomic_type_kind_t  akind;
 };
 
 struct builtin_type_t {
-	type_base_t  type;
+	type_base_t  base;
 	symbol_t    *symbol;
 	type_t      *real_type;
 };
 
 struct pointer_type_t {
-	type_base_t  type;
+	type_base_t  base;
 	type_t      *points_to;
 };
 
 struct array_type_t {
-	type_base_t   type;
+	type_base_t   base;
 	type_t       *element_type;
 	expression_t *size_expression;
 	size_t        size;
@@ -104,29 +109,46 @@ 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           type;
-	type_t               *return_type;
-	function_parameter_t *parameters;
+	type_base_t           base;
+	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;
 };
 
 struct compound_type_t {
-	type_base_t    type;
+	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;
 };
 
 struct enum_type_t {
-	type_base_t    type;
+	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 */
@@ -134,28 +156,31 @@ struct enum_type_t {
 };
 
 struct typedef_type_t {
-	type_base_t    type;
+	type_base_t    base;
 	declaration_t *declaration;
 	type_t        *resolved_type;
 };
 
 struct typeof_type_t {
-	type_base_t   type;
+	type_base_t   base;
 	expression_t *expression;
 	type_t       *typeof_type;
 	type_t       *resolved_type;
 };
 
 struct bitfield_type_t {
-	type_base_t   type;
-	type_t       *base;
-	expression_t *size;
+	type_base_t   base;
+	type_t       *base_type;
+	expression_t *size_expression; /**< The expression for the bit size. */
+	il_size_t     bit_size;        /**< Size of this bitfield in bits. */
 };
 
 union type_t {
 	type_kind_t      kind;
 	type_base_t      base;
 	atomic_type_t    atomic;
+	complex_type_t   complex;
+	imaginary_type_t imaginary;
 	builtin_type_t   builtin;
 	pointer_type_t   pointer;
 	array_type_t     array;
@@ -168,6 +193,8 @@ union type_t {
 };
 
 type_t *make_atomic_type(atomic_type_kind_t type, type_qualifiers_t qualifiers);
+type_t *make_complex_type(atomic_type_kind_t type, type_qualifiers_t qualifiers);
+type_t *make_imaginary_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_array_type(type_t *element_type, size_t size,
                         type_qualifiers_t qualifiers);