X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=types.c;h=870338616d033d6a800019300a296aa632171c4d;hb=1a59b32f89004a862c11a48ace2728a181579ccd;hp=a9ef574536843e37df8444420f806c8dab022e12;hpb=51889949a4fb4ee72d9ed05ef194e5dd8f1b4563;p=cparser

diff --git a/types.c b/types.c
index a9ef574..8703386 100644
--- a/types.c
+++ b/types.c
@@ -70,6 +70,8 @@ type_t *type_uptrdiff_t;
 type_t *type_wchar_t;
 type_t *type_const_wchar_t;
 type_t *type_wint_t;
+type_t *type_int32_t;
+type_t *type_int64_t;
 
 type_t *type_intmax_t_ptr;
 type_t *type_ptrdiff_t_ptr;
@@ -125,15 +127,19 @@ void init_basic_types(void)
 	type_void               = make_atomic_type(ATOMIC_TYPE_VOID,        TYPE_QUALIFIER_NONE);
 	type_const_void         = make_atomic_type(ATOMIC_TYPE_VOID,        TYPE_QUALIFIER_CONST);
 
+	int8_type_kind  = find_signed_int_atomic_type_kind_for_size(1);
+	int16_type_kind = find_signed_int_atomic_type_kind_for_size(2);
+	int32_type_kind = find_signed_int_atomic_type_kind_for_size(4);
+	int64_type_kind = find_signed_int_atomic_type_kind_for_size(8);
+
+	type_int32_t = make_atomic_type(int32_type_kind, TYPE_QUALIFIER_NONE);
+	type_int64_t = make_atomic_type(int64_type_kind, TYPE_QUALIFIER_NONE);
+
 	/* microsoft types */
 	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);
 		type_int16               = make_atomic_type(int16_type_kind, TYPE_QUALIFIER_NONE);
-		int32_type_kind          = find_signed_int_atomic_type_kind_for_size(4);
 		type_int32               = make_atomic_type(int32_type_kind, TYPE_QUALIFIER_NONE);
-		int64_type_kind          = find_signed_int_atomic_type_kind_for_size(8);
 		type_int64               = make_atomic_type(int64_type_kind, TYPE_QUALIFIER_NONE);
 		unsigned_int8_type_kind  = find_unsigned_int_atomic_type_kind_for_size(1);
 		type_unsigned_int8       = make_atomic_type(unsigned_int8_type_kind, TYPE_QUALIFIER_NONE);
@@ -178,14 +184,19 @@ void init_basic_types(void)
 	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);
+}
+
+void init_wchar_types(type_t *base)
+{
+	assert(base->kind == TYPE_ATOMIC);
+	type_wchar_t = base;
+	type_const_wchar_t
+		= make_atomic_type(base->atomic.akind, TYPE_QUALIFIER_CONST);
 	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);