X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_t.h;h=63d730048dea05b93244712a6e03a8ae593c4d07;hb=e1487550e8addd019fea3810b59aaa57a26c0471;hp=becc8a0df3f610bb28d18cb0c2f67f77b5fa79d8;hpb=27f4ce3da8d78ff0e70afde834793e0ebd81a42a;p=cparser

diff --git a/type_t.h b/type_t.h
index becc8a0..63d7300 100644
--- a/type_t.h
+++ b/type_t.h
@@ -44,6 +44,7 @@ typedef enum type_kind_t {
 	TYPE_ENUM,
 	TYPE_FUNCTION,
 	TYPE_POINTER,
+	TYPE_REFERENCE,
 	TYPE_ARRAY,
 	TYPE_BITFIELD,
 	TYPE_BUILTIN,
@@ -59,7 +60,6 @@ typedef unsigned short type_modifiers_t;
 
 struct type_base_t {
 	type_kind_t       kind;
-	source_position_t source_position;
 	il_size_t         size;           /**< The size of this type. */
 	type_qualifiers_t qualifiers;
 	type_modifiers_t  modifiers;
@@ -92,6 +92,12 @@ struct builtin_type_t {
 struct pointer_type_t {
 	type_base_t  base;
 	type_t      *points_to;
+	variable_t  *base_variable;  /**< Microsoft __based() extension */
+};
+
+struct reference_type_t {
+	type_base_t  base;
+	type_t      *refers_to;
 };
 
 struct array_type_t {
@@ -102,11 +108,11 @@ struct array_type_t {
 
 	ir_node      *size_node; /**< used by ast2firm phase */
 
-	unsigned      is_static         : 1; /**< a [static] type */
-	unsigned      is_variable       : 1; /**< a [*] type */
-	unsigned      has_implicit_size : 1;
-	unsigned      size_constant     : 1; /**< size expression is constant */
-	unsigned      is_vla            : 1; /**< it's a variable length array */
+	bool          is_static         : 1; /**< a [static] type */
+	bool          is_variable       : 1; /**< a [*] type */
+	bool          has_implicit_size : 1;
+	bool          size_constant     : 1; /**< size expression is constant */
+	bool          is_vla            : 1; /**< it's a variable length array */
 };
 
 /**
@@ -114,9 +120,16 @@ struct array_type_t {
  */
 struct function_parameter_t {
 	type_t               *type;  /**< The parameter type. */
-	function_parameter_t *next;  /**< Points to the next type inthe parameter list.*/
+	function_parameter_t *next;  /**< Points to the next type in the parameter list.*/
 };
 
+/** Linkage specifications. */
+typedef enum linkage_kind_t {
+	LINKAGE_INVALID,
+	LINKAGE_C,       /**< C linkage. */
+	LINKAGE_CXX      /**< C++ linkage. */
+} linkage_kind_t;
+
 /** Calling conventions. */
 typedef enum cc_kind_t {
 	CC_DEFAULT,      /**< default calling convention. */
@@ -133,32 +146,33 @@ struct function_type_t {
 	type_base_t           base;
 	type_t               *return_type;        /**< The return type. */
 	function_parameter_t *parameters;         /**< A list of the parameter types. */
+	linkage_kind_t        linkage;
 	cc_kind_t             calling_convention; /**< The specified calling convention. */
-	unsigned              variadic : 1;
-	unsigned              unspecified_parameters : 1;
-	unsigned              kr_style_parameters : 1;
+	bool                  variadic : 1;
+	bool                  unspecified_parameters : 1;
+	bool                  kr_style_parameters : 1;
 };
 
 struct compound_type_t {
-	type_base_t    base;
-	unsigned       packed:1;       /** Set if packed was specified. */
+	type_base_t     base;
+	bool            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;
+	compound_t     *compound;
 };
 
 struct enum_type_t {
-	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 */
-	declaration_t *declaration;
+	type_base_t     base;
+	/** 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;
 };
 
 struct typedef_type_t {
-	type_base_t    base;
-	declaration_t *declaration;
-	type_t        *resolved_type;
+	type_base_t  base;
+	typedef_t   *typedefe;
+	type_t      *resolved_type;
 };
 
 struct typeof_type_t {
@@ -183,6 +197,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;
@@ -196,6 +211,9 @@ 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);
 
@@ -223,6 +241,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));