fix incorrect type size for wide string literals

[cparser] / mangle.c

diff --git a/mangle.c b/mangle.c
index 83fb373..f8f32b1 100644 (file)
--- a/mangle.c
+++ b/mangle.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
@@ -40,6 +40,7 @@ static char get_atomic_type_mangle(atomic_type_kind_t kind)
        switch (kind) {
        case ATOMIC_TYPE_INVALID: break;
        case ATOMIC_TYPE_VOID:        return 'v';
+       case ATOMIC_TYPE_WCHAR_T:     return 'w';
        case ATOMIC_TYPE_BOOL:        return 'b';
        case ATOMIC_TYPE_CHAR:        return 'c';
        case ATOMIC_TYPE_SCHAR:       return 'a';
@@ -70,6 +71,12 @@ static void mangle_pointer_type(const pointer_type_t *type)
        mangle_type(type->points_to);
 }
 
+static void mangle_reference_type(const reference_type_t *type)
+{
+       obstack_1grow(&obst, 'R');
+       mangle_type(type->refers_to);
+}
+
 static void mangle_parameters(const function_type_t *type)
 {
        if (type->unspecified_parameters)
@@ -182,6 +189,9 @@ static void mangle_type(type_t *orig_type)
        case TYPE_POINTER:
                mangle_pointer_type(&type->pointer);
                return;
+       case TYPE_REFERENCE:
+               mangle_reference_type(&type->reference);
+               return;
        case TYPE_FUNCTION:
                mangle_function_type(&type->function);
                return;
@@ -212,7 +222,6 @@ static void mangle_type(type_t *orig_type)
 
        case TYPE_BITFIELD:
                panic("no mangling for this type implemented yet");
-               break;
        }
        panic("invalid type encountered while mangling");
 }
@@ -252,12 +261,11 @@ ident *create_name_win32(entity_t *entity)
 
        assert(is_declaration(entity));
 
-       if (entity->declaration.modifiers & DM_DLLIMPORT) {
-               /* add prefix for imported symbols */
-               obstack_printf(o, "__imp_");
-       }
-
        if (entity->kind == ENTITY_FUNCTION) {
+               if (entity->declaration.modifiers & DM_DLLIMPORT)
+                       /* add prefix for imported symbols */
+                       obstack_printf(o, "__imp_");
+
                cc_kind_t cc = entity->declaration.type->function.calling_convention;
 
                /* calling convention prefix */
@@ -271,7 +279,7 @@ ident *create_name_win32(entity_t *entity)
 
                switch (entity->declaration.type->function.linkage) {
                        case LINKAGE_INVALID:
-                               break;
+                               panic("linkage type of function is invalid");
 
                        case LINKAGE_C:
                                obstack_printf(o, "%s", entity->base.symbol->string);
@@ -321,7 +329,9 @@ ident *create_name_linux_elf(entity_t *entity)
 
        if (entity->kind == ENTITY_FUNCTION) {
                switch (entity->declaration.type->function.linkage) {
-                       case LINKAGE_INVALID: break;
+                       case LINKAGE_INVALID:
+                               panic("linkage type of function is invalid");
+
                        case LINKAGE_C:       break;
                        case LINKAGE_CXX:     needs_mangling = true; break;
                }
@@ -343,6 +353,9 @@ ident *create_name_linux_elf(entity_t *entity)
  */
 ident *create_name_macho(entity_t *entity)
 {
+       if (entity->kind == ENTITY_FUNCTION && entity->declaration.type->function.linkage == LINKAGE_INVALID)
+               panic("linkage type of function is invalid");
+
        obstack_printf(&obst, "_%s", entity->base.symbol->string);
        return make_id_from_obst();
 }