Accept -Wno-all, -Wno-extra and -Wno-unused like GCC.

[cparser] / type_t.h

diff --git a/type_t.h b/type_t.h
index a100c69..d6131d5 100644 (file)
--- a/type_t.h
+++ b/type_t.h
@@ -12,10 +12,11 @@
 #include "ast_t.h"
 #include "adt/obst.h"
 
-struct obstack *type_obst;
+extern struct obstack *type_obst;
 
 typedef enum {
        TYPE_INVALID,
+       TYPE_ERROR,
        TYPE_ATOMIC,
        TYPE_COMPOUND_STRUCT,
        TYPE_COMPOUND_UNION,
@@ -23,10 +24,11 @@ typedef enum {
        TYPE_FUNCTION,
        TYPE_POINTER,
        TYPE_ARRAY,
+       TYPE_BITFIELD,
        TYPE_BUILTIN,
        TYPE_TYPEDEF,
        TYPE_TYPEOF,
-} type_type_t;
+} type_kind_t;
 
 /* note that the constant values represent the rank of the types as defined
  * in § 6.3.1 */
@@ -56,7 +58,8 @@ typedef enum {
        ATOMIC_TYPE_DOUBLE_IMAGINARY,
        ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY,
 #endif
-} atomic_type_type_t;
+       ATOMIC_TYPE_LAST
+} atomic_type_kind_t;
 
 typedef enum {
        TYPE_QUALIFIER_NONE     = 0,
@@ -68,7 +71,7 @@ typedef enum {
 typedef unsigned int type_qualifiers_t;
 
 struct type_base_t {
-       type_type_t       type;
+       type_kind_t       kind;
        type_qualifiers_t qualifiers;
 
        ir_type          *firm_type;
@@ -76,7 +79,7 @@ struct type_base_t {
 
 struct atomic_type_t {
        type_base_t         type;
-       atomic_type_type_t  atype;
+       atomic_type_kind_t  akind;
 };
 
 struct builtin_type_t {
@@ -105,10 +108,11 @@ struct function_parameter_t {
 
 struct function_type_t {
        type_base_t           type;
-       type_t               *result_type;
+       type_t               *return_type;
        function_parameter_t *parameters;
-       bool                  variadic;
-       bool                  unspecified_parameters;
+       unsigned              variadic : 1;
+       unsigned              unspecified_parameters : 1;
+       unsigned              kr_style_parameters : 1;
 };
 
 struct compound_type_t {
@@ -139,8 +143,14 @@ struct typeof_type_t {
        type_t       *resolved_type;
 };
 
+struct bitfield_type_t {
+       type_base_t   type;
+       type_t       *base;
+       expression_t *size;
+};
+
 union type_t {
-       type_type_t      type;
+       type_kind_t      kind;
        type_base_t      base;
        atomic_type_t    atomic;
        builtin_type_t   builtin;
@@ -150,41 +160,54 @@ union type_t {
        compound_type_t  compound;
        enum_type_t      enumt;
        typedef_type_t   typedeft;
+       bitfield_type_t  bitfield;
        typeof_type_t    typeoft;
 };
 
-type_t *make_atomic_type(atomic_type_type_t type, type_qualifiers_t qualifiers);
+type_t *make_atomic_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 *duplicate_type(type_t *type);
+type_t *duplicate_type(const type_t *type);
 
 static inline bool is_typeref(const type_t *type)
 {
-       return type->type == TYPE_TYPEDEF || type->type == TYPE_TYPEOF;
+       return type->kind == TYPE_TYPEDEF || type->kind == TYPE_TYPEOF;
 }
 
-static inline bool is_type_atomic(const type_t *type, atomic_type_type_t atype)
+static inline bool is_type_atomic(const type_t *type, atomic_type_kind_t atype)
 {
        assert(!is_typeref(type));
 
-       if(type->type != TYPE_ATOMIC)
+       if(type->kind != TYPE_ATOMIC)
                return false;
        const atomic_type_t *atomic_type = &type->atomic;
 
-       return atomic_type->atype == atype;
+       return atomic_type->akind == atype;
 }
 
 static inline bool is_type_pointer(const type_t *type)
 {
        assert(!is_typeref(type));
-       return type->type == TYPE_POINTER;
+       return type->kind == TYPE_POINTER;
+}
+
+static inline bool is_type_array(const type_t *type)
+{
+       assert(!is_typeref(type));
+       return type->kind == TYPE_ARRAY;
+}
+
+static inline bool is_type_function(const type_t *type)
+{
+       assert(!is_typeref(type));
+       return type->kind == TYPE_FUNCTION;
 }
 
 static inline bool is_type_compound(const type_t *type)
 {
        assert(!is_typeref(type));
-       return type->type == TYPE_COMPOUND_STRUCT
-               || type->type == TYPE_COMPOUND_UNION;
+       return type->kind == TYPE_COMPOUND_STRUCT
+               || type->kind == TYPE_COMPOUND_UNION;
 }
 
 #endif