X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=mangle.c;h=caaf734ecd31c172800a7d80dda3d90f1a5c611d;hb=59314ed9eb7b881052ae37fd05be224795cbd616;hp=ea4bc796446075f92bf578caf9540b6b90df169b;hpb=17766210f25e09070abeb1e4117e052e6bef94dc;p=cparser

diff --git a/mangle.c b/mangle.c
index ea4bc79..caaf734 100644
--- a/mangle.c
+++ b/mangle.c
@@ -38,7 +38,7 @@ static void mangle_type(type_t *type);
 static char get_atomic_type_mangle(atomic_type_kind_t kind)
 {
 	switch (kind) {
-	case ATOMIC_TYPE_INVALID: break;
+	case ATOMIC_TYPE_INVALID:     break;
 	case ATOMIC_TYPE_VOID:        return 'v';
 	case ATOMIC_TYPE_WCHAR_T:     return 'w';
 	case ATOMIC_TYPE_BOOL:        return 'b';
@@ -150,13 +150,13 @@ static void mangle_array_type(const array_type_t *type)
 	mangle_type(type->element_type);
 }
 
-static void mangle_complex_type(const complex_type_t *type)
+static void mangle_complex_type(const atomic_type_t *type)
 {
 	obstack_1grow(&obst, 'C');
 	obstack_1grow(&obst, get_atomic_type_mangle(type->akind));
 }
 
-static void mangle_imaginary_type(const imaginary_type_t *type)
+static void mangle_imaginary_type(const atomic_type_t *type)
 {
 	obstack_1grow(&obst, 'G');
 	obstack_1grow(&obst, get_atomic_type_mangle(type->akind));
@@ -206,22 +206,16 @@ static void mangle_type(type_t *orig_type)
 		mangle_array_type(&type->array);
 		return;
 	case TYPE_COMPLEX:
-		mangle_complex_type(&type->complex);
+		mangle_complex_type(&type->atomic);
 		return;
 	case TYPE_IMAGINARY:
-		mangle_imaginary_type(&type->imaginary);
+		mangle_imaginary_type(&type->atomic);
 		return;
-	case TYPE_INVALID:
-		panic("invalid type encountered while mangling");
 	case TYPE_ERROR:
 		panic("error type encountered while mangling");
-	case TYPE_BUILTIN:
 	case TYPE_TYPEDEF:
 	case TYPE_TYPEOF:
 		panic("typeref not resolved while manging?!?");
-
-	case TYPE_BITFIELD:
-		panic("no mangling for this type implemented yet");
 	}
 	panic("invalid type encountered while mangling");
 }
@@ -297,9 +291,6 @@ ident *create_name_win32(entity_t *entity)
 		}
 
 		switch (type->function.linkage) {
-		case LINKAGE_INVALID:
-			panic("linkage type of function is invalid");
-
 		case LINKAGE_C:
 			obstack_printf(o, "%s", entity->base.symbol->string);
 			break;
@@ -350,8 +341,6 @@ ident *create_name_linux_elf(entity_t *entity)
 		type_t *type = skip_typeref(entity->declaration.type);
 		assert(is_type_function(type));
 		switch (type->function.linkage) {
-			case LINKAGE_INVALID:
-				panic("linkage type of function is invalid");
 			case LINKAGE_C:
 				if (entity->function.actual_name != NULL)
 					name = entity->function.actual_name->string;
@@ -379,9 +368,6 @@ ident *create_name_macho(entity_t *entity)
 		assert(is_type_function(type));
 
 		switch (type->function.linkage) {
-			case LINKAGE_INVALID:
-				panic("linkage type of function is invalid");
-
 			default:
 				if (entity->function.actual_name != NULL)
 					return new_id_from_str(entity->function.actual_name->string);