X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_t.h;h=a2ccb371d5f72402777b8e9408b90e186b06e4a5;hb=1c4466f3b10ff840991a8089d12e90182aa3c803;hp=9015589862e7ed286282a2bf33322028384fa304;hpb=9fc5a3152558711a37406f79913f77cab1dc9db7;p=cparser

diff --git a/type_t.h b/type_t.h
index 9015589..a2ccb37 100644
--- 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
@@ -47,24 +47,15 @@ typedef enum type_kind_t {
 	TYPE_REFERENCE,
 	TYPE_ARRAY,
 	TYPE_BITFIELD,
-	TYPE_BUILTIN,
 	TYPE_TYPEDEF,
 	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;
 };
 
@@ -83,16 +74,10 @@ struct imaginary_type_t {
 	atomic_type_kind_t  akind;
 };
 
-struct builtin_type_t {
-	type_base_t  base;
-	symbol_t    *symbol;
-	type_t      *real_type;
-};
-
 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 {
@@ -148,6 +133,7 @@ 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;
@@ -196,7 +182,6 @@ union type_t {
 	atomic_type_t    atomic;
 	complex_type_t   complex;
 	imaginary_type_t imaginary;
-	builtin_type_t   builtin;
 	pointer_type_t   pointer;
 	reference_type_t reference;
 	array_type_t     array;
@@ -208,6 +193,9 @@ 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);
@@ -273,12 +261,6 @@ static inline bool is_type_struct(const type_t *type)
 	return type->kind == TYPE_COMPOUND_STRUCT;
 }
 
-static inline bool is_type_builtin(const type_t *type)
-{
-	assert(!is_typeref(type));
-	return type->kind == TYPE_BUILTIN;
-}
-
 static inline bool is_type_compound(const type_t *type)
 {
 	assert(!is_typeref(type));
@@ -292,4 +274,53 @@ static inline bool is_type_valid(const type_t *type)
 	return type->kind != TYPE_ERROR;
 }
 
+/**
+ * Allocate a type node of given kind and initialize all
+ * fields with zero.
+ *
+ * @param kind             type kind to allocate
+ */
+type_t *allocate_type_zero(type_kind_t kind);
+
+/**
+ * Creates a return_type (func)(void) function type if not
+ * already exists.
+ *
+ * @param return_type    the return type
+ */
+type_t *make_function_0_type(type_t *return_type);
+
+/**
+ * Creates a return_type (func)(argument_type) function type if not
+ * already exists.
+ *
+ * @param return_type    the return type
+ * @param argument_type  the argument type
+ */
+type_t *make_function_1_type(type_t *return_type, type_t *argument_type1);
+
+
+/**
+ * Creates a return_type (func)(argument_type1,argument_type2) function type
+ * if not already exists.
+ */
+type_t *make_function_2_type(type_t *return_type, type_t *argument_type1,
+                             type_t *argument_type2);
+
+/**
+ * Creates a return_type (func)(argument_type, ...) function type if not
+ * already exists.
+ *
+ * @param return_type    the return type
+ * @param argument_type  the argument type
+ */
+type_t *make_function_1_type_variadic(type_t *return_type, type_t *argument_type);
+
+/**
+ * Create a function type with n parameters
+ */
+type_t *make_function_type(type_t *return_type, int n_types,
+                           type_t *const *argument_types,
+						   decl_modifiers_t modifiers);
+
 #endif