X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_t.h;h=f85e9d18659b41affff52cf22a8b768f60e39168;hb=0a499089dd2383e73ae8364c8eae82c068ba980b;hp=2d602ec14b7bb1c3094781e1eb26e6612c46addf;hpb=07ad993854e86b85d303cc4ea1fb991378269051;p=cparser

diff --git a/type_t.h b/type_t.h
index 2d602ec..f85e9d1 100644
--- a/type_t.h
+++ b/type_t.h
@@ -37,6 +37,8 @@ typedef enum {
 	TYPE_INVALID,
 	TYPE_ERROR,
 	TYPE_ATOMIC,
+	TYPE_COMPLEX,
+	TYPE_IMAGINARY,
 	TYPE_COMPOUND_STRUCT,
 	TYPE_COMPOUND_UNION,
 	TYPE_ENUM,
@@ -49,42 +51,17 @@ typedef enum {
 	TYPE_TYPEOF,
 } type_kind_t;
 
-/* note that the constant values represent the rank of the types as defined
- * in § 6.3.1 */
-typedef enum {
-	ATOMIC_TYPE_INVALID = 0,
-	ATOMIC_TYPE_VOID,
-	ATOMIC_TYPE_CHAR,
-	ATOMIC_TYPE_SCHAR,
-	ATOMIC_TYPE_UCHAR,
-	ATOMIC_TYPE_SHORT,
-	ATOMIC_TYPE_USHORT,
-	ATOMIC_TYPE_INT,
-	ATOMIC_TYPE_UINT,
-	ATOMIC_TYPE_LONG,
-	ATOMIC_TYPE_ULONG,
-	ATOMIC_TYPE_LONGLONG,
-	ATOMIC_TYPE_ULONGLONG,
-	ATOMIC_TYPE_FLOAT,
-	ATOMIC_TYPE_DOUBLE,
-	ATOMIC_TYPE_LONG_DOUBLE,
-	ATOMIC_TYPE_BOOL,
-#ifdef PROVIDE_COMPLEX
-	ATOMIC_TYPE_FLOAT_COMPLEX,
-	ATOMIC_TYPE_DOUBLE_COMPLEX,
-	ATOMIC_TYPE_LONG_DOUBLE_COMPLEX,
-	ATOMIC_TYPE_FLOAT_IMAGINARY,
-	ATOMIC_TYPE_DOUBLE_IMAGINARY,
-	ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY,
-#endif
-	ATOMIC_TYPE_LAST
-} atomic_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;
@@ -99,23 +76,33 @@ struct type_base_t {
 };
 
 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;
@@ -135,7 +122,7 @@ struct function_parameter_t {
 };
 
 struct function_type_t {
-	type_base_t           type;
+	type_base_t           base;
 	type_t               *return_type;
 	function_parameter_t *parameters;
 	unsigned              variadic : 1;
@@ -144,14 +131,14 @@ struct function_type_t {
 };
 
 struct compound_type_t {
-	type_base_t    type;
+	type_base_t    base;
 	/** 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 */
@@ -159,21 +146,21 @@ 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;
+	type_base_t   base;
+	type_t       *base_type;
 	expression_t *size;
 };
 
@@ -181,6 +168,8 @@ 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;
@@ -193,6 +182,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);