- when parsing compound types, do NOT destroy old declarations if

[cparser] / type.h

diff --git a/type.h b/type.h
index e9fcb5e..92baa7d 100644 (file)
--- a/type.h
+++ b/type.h
@@ -25,9 +25,13 @@
 #include "ast.h"
 #include "symbol.h"
 
+/** Type used to express sizes. */
+typedef unsigned long il_size_t;
+typedef unsigned char il_alignment_t;
+
 /* note that the constant values represent the rank of the types as defined
  * in § 6.3.1 */
-typedef enum {
+typedef enum atomic_type_kind_t {
        ATOMIC_TYPE_INVALID = 0,
        ATOMIC_TYPE_VOID,
        ATOMIC_TYPE_CHAR,
@@ -46,17 +50,10 @@ typedef enum {
        ATOMIC_TYPE_LONG_DOUBLE,
        ATOMIC_TYPE_BOOL,
 
-       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,
-
-       ATOMIC_TYPE_LAST = ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY
+       ATOMIC_TYPE_LAST = ATOMIC_TYPE_BOOL
 } atomic_type_kind_t;
 
-typedef enum {
+typedef enum atomic_type_flag_t {
        ATOMIC_TYPE_FLAG_NONE       = 0,
        ATOMIC_TYPE_FLAG_SIGNED     = 1 << 0,
        ATOMIC_TYPE_FLAG_INTEGER    = 1 << 1,
@@ -65,8 +62,24 @@ typedef enum {
        ATOMIC_TYPE_FLAG_COMPLEX    = 1 << 4,
 } atomic_type_flag_t;
 
+typedef enum type_qualifier_t {
+       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 short type_qualifiers_t;
+
 typedef struct type_base_t           type_base_t;
 typedef struct atomic_type_t         atomic_type_t;
+typedef struct complex_type_t        complex_type_t;
+typedef struct imaginary_type_t      imaginary_type_t;
 typedef struct pointer_type_t        pointer_type_t;
 typedef struct function_parameter_t  function_parameter_t;
 typedef struct function_type_t       function_type_t;
@@ -91,7 +104,7 @@ void print_type(const type_t *type);
 void print_type_ext(const type_t *type, const symbol_t *symbol,
                     const scope_t *scope);
 
-void print_type_qualifiers(unsigned qualifiers);
+void print_type_qualifiers(type_qualifiers_t qualifiers);
 
 void print_enum_definition(const declaration_t *declaration);
 void print_compound_definition(const declaration_t *declaration);
@@ -108,6 +121,11 @@ void inc_type_visited(void);
  */
 bool is_type_integer(const type_t *type);
 
+/**
+ * Returns true if the given type is an enum type.
+ */
+bool is_type_enum(const type_t *type);
+
 /**
  * return true if type contains signed numbers
  */
@@ -118,6 +136,13 @@ bool is_type_signed(const type_t *type);
  */
 bool is_type_float(const type_t *type);
 
+/**
+ * returns true if type contains complex numbers
+ */
+bool is_type_complex(const type_t *type);
+
+bool is_type_real(const type_t *type);
+
 /**
  * returns true if the type is valid. A type is valid if it contains no
  * unresolved references anymore and is not of TYPE_INVALID.
@@ -125,22 +150,23 @@ bool is_type_float(const type_t *type);
 bool type_valid(const type_t *type);
 
 /**
- * returns true if the type is an arithmetic type (6.2.18)
+ * returns true if the type is an arithmetic type (§6.2.5 clause 18)
  */
 bool is_type_arithmetic(const type_t *type);
 
 /**
- * returns true if the type is a scalar type (6.2.21)
+ * returns true if the type is a scalar type (§6.2.5 clause 21)
  */
 bool is_type_scalar(const type_t *type);
 
 bool is_type_incomplete(const type_t *type);
 
-bool types_compatible(const type_t *type1, const type_t *type2);
+bool is_type_object(const type_t *type);
 
-bool pointers_compatible(const type_t *type1, const type_t *type2);
+bool types_compatible(const type_t *type1, const type_t *type2);
 
 type_t *get_unqualified_type(type_t *type);
+type_t *get_qualified_type(type_t*, type_qualifiers_t);
 type_t *skip_typeref(type_t *type);
 
 /**