X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=types.c;h=9f0788845763f1c4992e560bfb5e22a252d21736;hb=8221015a4d0babf80e2514481647d75953eb30ac;hp=e49a68900964422b73a63b364b7b9cecd35fc2a1;hpb=386eb6028b666dfa460594056562beff9c3cfa37;p=cparser

diff --git a/types.c b/types.c
index e49a689..9f07888 100644
--- a/types.c
+++ b/types.c
@@ -20,11 +20,14 @@
 #include "type_t.h"
 #include "types.h"
 #include "lang_features.h"
+#include "entity_t.h"
 
 /** The error type. */
 type_t *type_error_type;
 
+type_t *type_bool;
 type_t *type_char;
+type_t *type_const_char;
 type_t *type_double;
 type_t *type_float;
 type_t *type_int;
@@ -32,16 +35,20 @@ type_t *type_long_double;
 type_t *type_long_long;
 type_t *type_long;
 type_t *type_short;
+type_t *type_unsigned_short;
 type_t *type_signed_char;
+type_t *type_unsigned_char;
 type_t *type_unsigned_int;
 type_t *type_unsigned_long_long;
 type_t *type_unsigned_long;
 type_t *type_void;
 
 type_t *type_char_ptr;
+type_t *type_const_char_ptr;
 type_t *type_int_ptr;
 type_t *type_long_long_ptr;
 type_t *type_long_ptr;
+type_t *type_unsigned_long_ptr;
 type_t *type_short_ptr;
 type_t *type_signed_char_ptr;
 type_t *type_void_ptr;
@@ -55,12 +62,16 @@ type_t *type_ssize_t;
 type_t *type_uintmax_t;
 type_t *type_uptrdiff_t;
 type_t *type_wchar_t;
+type_t *type_const_wchar_t;
 type_t *type_wint_t;
 
 type_t *type_intmax_t_ptr;
 type_t *type_ptrdiff_t_ptr;
 type_t *type_ssize_t_ptr;
 type_t *type_wchar_t_ptr;
+type_t *type_const_wchar_t_ptr;
+
+type_t *type_valist;
 
 /* microsoft types */
 atomic_type_kind_t int8_type_kind            = ATOMIC_TYPE_INVALID;
@@ -82,15 +93,19 @@ type_t *type_unsigned_int8;
 type_t *type_unsigned_int16;
 type_t *type_unsigned_int32;
 type_t *type_unsigned_int64;
+type_t *type_int64_ptr;
 
 
 void init_basic_types(void)
 {
-	static const type_base_t error = { TYPE_ERROR, TYPE_QUALIFIER_NONE, 0, { NULL, 0 }, NULL };
+	static const type_base_t error = { TYPE_ERROR, TYPE_QUALIFIER_NONE, NULL };
 
 	type_error_type         = (type_t*)&error;
+	type_bool               = make_atomic_type(ATOMIC_TYPE_BOOL,        TYPE_QUALIFIER_NONE);
 	type_signed_char        = make_atomic_type(ATOMIC_TYPE_SCHAR,       TYPE_QUALIFIER_NONE);
+	type_unsigned_char      = make_atomic_type(ATOMIC_TYPE_UCHAR,       TYPE_QUALIFIER_NONE);
 	type_short              = make_atomic_type(ATOMIC_TYPE_SHORT,       TYPE_QUALIFIER_NONE);
+	type_unsigned_short     = make_atomic_type(ATOMIC_TYPE_USHORT,      TYPE_QUALIFIER_NONE);
 	type_int                = make_atomic_type(ATOMIC_TYPE_INT,         TYPE_QUALIFIER_NONE);
 	type_unsigned_int       = make_atomic_type(ATOMIC_TYPE_UINT,        TYPE_QUALIFIER_NONE);
 	type_long               = make_atomic_type(ATOMIC_TYPE_LONG,        TYPE_QUALIFIER_NONE);
@@ -104,7 +119,7 @@ void init_basic_types(void)
 	type_void               = make_atomic_type(ATOMIC_TYPE_VOID,        TYPE_QUALIFIER_NONE);
 
 	/* microsoft types */
-	if(c_mode & _MS) {
+	if (c_mode & _MS) {
 		int8_type_kind           = find_signed_int_atomic_type_kind_for_size(1);
 		type_int8                = make_atomic_type(int8_type_kind, TYPE_QUALIFIER_NONE);
 		int16_type_kind          = find_signed_int_atomic_type_kind_for_size(2);
@@ -121,6 +136,9 @@ void init_basic_types(void)
 		type_unsigned_int32      = make_atomic_type(unsigned_int32_type_kind, TYPE_QUALIFIER_NONE);
 		unsigned_int64_type_kind = find_unsigned_int_atomic_type_kind_for_size(8);
 		type_unsigned_int64      = make_atomic_type(unsigned_int64_type_kind, TYPE_QUALIFIER_NONE);
+
+		/* pointer types */
+		type_int64_ptr           = make_pointer_type(type_int64,              TYPE_QUALIFIER_NONE);
 	}
 
 	/* pointer types */
@@ -130,7 +148,31 @@ void init_basic_types(void)
 	type_short_ptr          = make_pointer_type(type_short,             TYPE_QUALIFIER_NONE);
 	type_int_ptr            = make_pointer_type(type_int,               TYPE_QUALIFIER_NONE);
 	type_long_ptr           = make_pointer_type(type_long,              TYPE_QUALIFIER_NONE);
+	type_unsigned_long_ptr  = make_pointer_type(type_unsigned_long,     TYPE_QUALIFIER_NONE);
 	type_long_long_ptr      = make_pointer_type(type_long_long,         TYPE_QUALIFIER_NONE);
 
 	type_char_ptr_ptr       = make_pointer_type(type_char_ptr,          TYPE_QUALIFIER_NONE);
+
+	/* const character types */
+	type_const_char         = make_atomic_type(ATOMIC_TYPE_CHAR,        TYPE_QUALIFIER_CONST);
+	type_const_char_ptr     = make_pointer_type(type_const_char,        TYPE_QUALIFIER_NONE);
+
+	/* other types */
+	type_intmax_t    = type_long_long;
+	type_size_t      = type_unsigned_long;
+	type_ssize_t     = type_long;
+	type_ptrdiff_t   = type_long;
+	type_uintmax_t   = type_unsigned_long_long;
+	type_uptrdiff_t  = type_unsigned_long;
+	type_wchar_t     = make_atomic_type(wchar_atomic_kind, TYPE_QUALIFIER_NONE);
+	type_wint_t      = type_int;
+	type_const_wchar_t
+		= make_atomic_type(wchar_atomic_kind, TYPE_QUALIFIER_CONST);
+
+	type_intmax_t_ptr  = make_pointer_type(type_intmax_t,  TYPE_QUALIFIER_NONE);
+	type_ptrdiff_t_ptr = make_pointer_type(type_ptrdiff_t, TYPE_QUALIFIER_NONE);
+	type_ssize_t_ptr   = make_pointer_type(type_ssize_t,   TYPE_QUALIFIER_NONE);
+	type_wchar_t_ptr   = make_pointer_type(type_wchar_t,   TYPE_QUALIFIER_NONE);
+	type_const_wchar_t_ptr
+		= make_pointer_type(type_const_wchar_t, TYPE_QUALIFIER_NONE);
 }