- 2009 patch

[cparser] / type_t.h

diff --git a/type_t.h b/type_t.h
index b0b02b8..2efe6b7 100644 (file)
--- a/type_t.h
+++ b/type_t.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -44,6 +44,7 @@ typedef enum type_kind_t {
        TYPE_ENUM,
        TYPE_FUNCTION,
        TYPE_POINTER,
+       TYPE_REFERENCE,
        TYPE_ARRAY,
        TYPE_BITFIELD,
        TYPE_BUILTIN,
@@ -51,19 +52,11 @@ typedef enum type_kind_t {
        TYPE_TYPEOF,
 } type_kind_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;
-       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. */
 
+       /* cached ast2firm infos */
        ir_type          *firm_type;
 };
 
@@ -91,7 +84,12 @@ struct builtin_type_t {
 struct pointer_type_t {
        type_base_t  base;
        type_t      *points_to;
-       variable_t  *base_variable;  /**< Microsoft __based() extension */
+       variable_t  *base_variable;  /**< Microsoft __based() extension: base variable or NULL. */
+};
+
+struct reference_type_t {
+       type_base_t  base;
+       type_t      *refers_to;
 };
 
 struct array_type_t {
@@ -142,9 +140,11 @@ struct function_type_t {
        function_parameter_t *parameters;         /**< A list of the parameter types. */
        linkage_kind_t        linkage;
        cc_kind_t             calling_convention; /**< The specified calling convention. */
+       decl_modifiers_t      modifiers;
        bool                  variadic : 1;
        bool                  unspecified_parameters : 1;
        bool                  kr_style_parameters : 1;
+       bool                  prototyped : 1;
 };
 
 struct compound_type_t {
@@ -156,11 +156,12 @@ struct compound_type_t {
 };
 
 struct enum_type_t {
-       type_base_t     base;
+       type_base_t         base;
+       atomic_type_kind_t  akind; /**< underlying atomic type */
        /** the enum entity. You can find the enum entries by walking the
         *  enum->base.next list until you don't find ENTITY_ENUM_VALUE entities
         *  anymore */
-       enum_t         *enume;
+       enum_t             *enume;
 };
 
 struct typedef_type_t {
@@ -191,6 +192,7 @@ union type_t {
        imaginary_type_t imaginary;
        builtin_type_t   builtin;
        pointer_type_t   pointer;
+       reference_type_t reference;
        array_type_t     array;
        function_type_t  function;
        compound_type_t  compound;
@@ -200,16 +202,21 @@ union type_t {
        typeof_type_t    typeoft;
 };
 
+/** The default calling convention for functions. */
+extern cc_kind_t default_calling_convention;
+
 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_reference_type(type_t *refers_to);
 type_t *make_based_pointer_type(type_t *points_to,
                                                                type_qualifiers_t qualifiers, variable_t *variable);
 type_t *make_array_type(type_t *element_type, size_t size,
                         type_qualifiers_t qualifiers);
 
 type_t *duplicate_type(const type_t *type);
+type_t *identify_new_type(type_t *type);
 
 static inline bool is_typeref(const type_t *type)
 {
@@ -233,6 +240,12 @@ static inline bool is_type_pointer(const type_t *type)
        return type->kind == TYPE_POINTER;
 }
 
+static inline bool is_type_reference(const type_t *type)
+{
+       assert(!is_typeref(type));
+       return type->kind == TYPE_REFERENCE;
+}
+
 static inline bool is_type_array(const type_t *type)
 {
        assert(!is_typeref(type));