X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_t.h;h=5832550f36f07eaffc312db754e14e1ab3b2ed8a;hb=208d1d00e37fcc44bf827b1cc50357c85c971c9a;hp=6f5364acc8e304b17a1654cfc5de77c2dd209116;hpb=877060fa4a4bb34e2b21c184bf5a7aca28f8abae;p=cparser

diff --git a/type_t.h b/type_t.h
index 6f5364a..5832550 100644
--- a/type_t.h
+++ b/type_t.h
@@ -1,3 +1,22 @@
+/*
+ * This file is part of cparser.
+ * Copyright (C) 2007-2008 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
 #ifndef TYPE_T_H
 #define TYPE_T_H
 
@@ -30,37 +49,6 @@ typedef enum {
 	TYPE_TYPEOF,
 } type_kind_t;
 
-/* note that the constant values represent the rank of the types as defined
- * in § 6.3.1 */
-typedef enum {
-	ATOMIC_TYPE_INVALID = 0,
-	ATOMIC_TYPE_VOID,
-	ATOMIC_TYPE_CHAR,
-	ATOMIC_TYPE_SCHAR,
-	ATOMIC_TYPE_UCHAR,
-	ATOMIC_TYPE_SHORT,
-	ATOMIC_TYPE_USHORT,
-	ATOMIC_TYPE_INT,
-	ATOMIC_TYPE_UINT,
-	ATOMIC_TYPE_LONG,
-	ATOMIC_TYPE_ULONG,
-	ATOMIC_TYPE_LONGLONG,
-	ATOMIC_TYPE_ULONGLONG,
-	ATOMIC_TYPE_FLOAT,
-	ATOMIC_TYPE_DOUBLE,
-	ATOMIC_TYPE_LONG_DOUBLE,
-	ATOMIC_TYPE_BOOL,
-#ifdef PROVIDE_COMPLEX
-	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,
-#endif
-	ATOMIC_TYPE_LAST
-} atomic_type_kind_t;
-
 typedef enum {
 	TYPE_QUALIFIER_NONE     = 0,
 	TYPE_QUALIFIER_CONST    = 1 << 0,
@@ -73,6 +61,8 @@ typedef unsigned int type_qualifiers_t;
 struct type_base_t {
 	type_kind_t       kind;
 	type_qualifiers_t qualifiers;
+	unsigned char     alignment;      /**< The extra alignment of the type, 0 for default. */
+	source_position_t source_position;
 
 	ir_type          *firm_type;
 };
@@ -96,9 +86,16 @@ struct pointer_type_t {
 struct array_type_t {
 	type_base_t   type;
 	type_t       *element_type;
-	expression_t *size;
-	bool          is_static;
-	bool          is_variable;
+	expression_t *size_expression;
+	size_t        size;
+
+	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 */
 };
 
 struct function_parameter_t {
@@ -117,7 +114,7 @@ struct function_type_t {
 
 struct compound_type_t {
 	type_base_t    type;
-	/** the declaration of the compound type, its context field
+	/** the declaration of the compound type, the scope of the declaration
 	 *  contains the compound entries. */
 	declaration_t *declaration;
 };
@@ -166,6 +163,8 @@ union type_t {
 
 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 *make_array_type(type_t *element_type, size_t size,
+                        type_qualifiers_t qualifiers);
 
 type_t *duplicate_type(const type_t *type);
 
@@ -203,6 +202,24 @@ static inline bool is_type_function(const type_t *type)
 	return type->kind == TYPE_FUNCTION;
 }
 
+static inline bool is_type_union(const type_t *type)
+{
+	assert(!is_typeref(type));
+	return type->kind == TYPE_COMPOUND_UNION;
+}
+
+static inline bool is_type_struct(const type_t *type)
+{
+	assert(!is_typeref(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));