X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=mangle.c;h=f8f32b154c441455af19c196da25ab83d3303971;hb=d9c2f28d8ca23867f292a952b0543807d35e672f;hp=c80ec3195d7a863d5e3d808964dee13ca03662bc;hpb=b7aee7a7ddee373437c04479c6ec00f14639d4da;p=cparser

diff --git a/mangle.c b/mangle.c
index c80ec31..f8f32b1 100644
--- 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)
@@ -157,8 +164,10 @@ static void mangle_imaginary_type(const imaginary_type_t *type)
 
 static void mangle_qualifiers(type_qualifiers_t qualifiers)
 {
+#if 0 /* Do not mangle restrict qualifiers.  GCC doesn't either */
 	if (qualifiers & TYPE_QUALIFIER_RESTRICT)
 		obstack_1grow(&obst, 'r');
+#endif
 	if (qualifiers & TYPE_QUALIFIER_VOLATILE)
 		obstack_1grow(&obst, 'V');
 	if (qualifiers & TYPE_QUALIFIER_CONST)
@@ -180,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;
@@ -210,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");
 }
@@ -250,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 */
@@ -269,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);
@@ -319,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;
 		}
@@ -341,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();
 }