X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=types.c;h=0f252455d761a16ffc2a090eb62fd40858e74909;hb=233b4629181c4a07fbabe8566c10ce2bae9224de;hp=578b3426833c19d8ecf7f1b1eaf98608b04511db;hpb=cfdd54ed11fdc4d9826b959d78f2d364bea9c41b;p=cparser

diff --git a/types.c b/types.c
index 578b342..0f25245 100644
--- a/types.c
+++ b/types.c
@@ -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
@@ -20,10 +20,12 @@
 #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;
@@ -35,6 +37,7 @@ 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;
@@ -45,6 +48,7 @@ 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;
@@ -67,6 +71,8 @@ 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;
 atomic_type_kind_t int16_type_kind           = ATOMIC_TYPE_INVALID;
@@ -87,15 +93,17 @@ 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, 0, TYPE_QUALIFIER_NONE,
-	                                   TYPE_MODIFIER_NONE, 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);
@@ -111,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);
@@ -128,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 */
@@ -137,6 +148,7 @@ 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);
@@ -144,4 +156,23 @@ void init_basic_types(void)
 	/* 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);
 }