main: rework preprocessor invocation

[cparser] / types.c

diff --git a/types.c b/types.c
index a9ef574..d6ff22e 100644 (file)
--- a/types.c
+++ b/types.c
@@ -61,6 +61,10 @@ type_t *type_const_void_ptr_restrict;
 
 type_t *type_char_ptr_ptr;
 
+type_t *type_char16_t;
+type_t *type_char32_t;
+type_t *type_char16_t_const;
+type_t *type_char32_t_const;
 type_t *type_intmax_t;
 type_t *type_ptrdiff_t;
 type_t *type_size_t;
@@ -70,7 +74,13 @@ 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_char16_t_ptr;
+type_t *type_char32_t_ptr;
+type_t *type_char16_t_const_ptr;
+type_t *type_char32_t_const_ptr;
 type_t *type_intmax_t_ptr;
 type_t *type_ptrdiff_t_ptr;
 type_t *type_ssize_t_ptr;
@@ -80,16 +90,16 @@ 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;
-atomic_type_kind_t int32_type_kind           = ATOMIC_TYPE_INVALID;
-atomic_type_kind_t int64_type_kind           = ATOMIC_TYPE_INVALID;
-atomic_type_kind_t int128_type_kind          = ATOMIC_TYPE_INVALID;
-atomic_type_kind_t unsigned_int8_type_kind   = ATOMIC_TYPE_INVALID;
-atomic_type_kind_t unsigned_int16_type_kind  = ATOMIC_TYPE_INVALID;
-atomic_type_kind_t unsigned_int32_type_kind  = ATOMIC_TYPE_INVALID;
-atomic_type_kind_t unsigned_int64_type_kind  = ATOMIC_TYPE_INVALID;
-atomic_type_kind_t unsigned_int128_type_kind = ATOMIC_TYPE_INVALID;
+atomic_type_kind_t int8_type_kind;
+atomic_type_kind_t int16_type_kind;
+atomic_type_kind_t int32_type_kind;
+atomic_type_kind_t int64_type_kind;
+atomic_type_kind_t int128_type_kind;
+atomic_type_kind_t unsigned_int8_type_kind;
+atomic_type_kind_t unsigned_int16_type_kind;
+atomic_type_kind_t unsigned_int32_type_kind;
+atomic_type_kind_t unsigned_int64_type_kind;
+atomic_type_kind_t unsigned_int128_type_kind;
 
 type_t *type_int8;
 type_t *type_int16;
@@ -125,15 +135,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,15 +192,30 @@ 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);
-       type_wchar_t_ptr   = make_pointer_type(type_wchar_t,   TYPE_QUALIFIER_NONE);
+}
+
+void init_wchar_types(atomic_type_kind_t akind)
+{
+       type_wchar_t       = make_atomic_type(akind, TYPE_QUALIFIER_NONE);
+       type_const_wchar_t = make_atomic_type(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);
+
+       atomic_type_kind_t const u2 = find_unsigned_int_atomic_type_kind_for_size(2);
+       type_char16_t           = make_atomic_type(u2, TYPE_QUALIFIER_NONE);
+       type_char16_t_const     = make_atomic_type(u2, TYPE_QUALIFIER_CONST);
+       type_char16_t_ptr       = make_pointer_type(type_char16_t,       TYPE_QUALIFIER_NONE);
+       type_char16_t_const_ptr = make_pointer_type(type_char16_t_const, TYPE_QUALIFIER_NONE);
+
+       atomic_type_kind_t const u4 = find_unsigned_int_atomic_type_kind_for_size(4);
+       type_char32_t           = make_atomic_type(u4, TYPE_QUALIFIER_NONE);
+       type_char32_t_const     = make_atomic_type(u4, TYPE_QUALIFIER_CONST);
+       type_char32_t_ptr       = make_pointer_type(type_char32_t,       TYPE_QUALIFIER_NONE);
+       type_char32_t_const_ptr = make_pointer_type(type_char32_t_const, TYPE_QUALIFIER_NONE);
 }