X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=mangle.c;h=6188d2aba2424e968f739b7dd5da2c0fd32ea982;hb=23b3436d2030528153fbdb477a9fb9ca115998a9;hp=2291001e2e534fd740e906682a5cfec18d6245f9;hpb=25e87415eecbd8d7cd3811d745568e70cec17bf1;p=cparser

diff --git a/mangle.c b/mangle.c
index 2291001..6188d2a 100644
--- a/mangle.c
+++ b/mangle.c
@@ -1,21 +1,6 @@
 /*
  * This file is part of cparser.
- * 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
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Copyright (C) 2012 Matthias Braun <matze@braunis.de>
  */
 #include <config.h>
 
@@ -38,7 +23,6 @@ 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_VOID:        return 'v';
 	case ATOMIC_TYPE_WCHAR_T:     return 'w';
 	case ATOMIC_TYPE_BOOL:        return 'b';
@@ -57,7 +41,7 @@ static char get_atomic_type_mangle(atomic_type_kind_t kind)
 	case ATOMIC_TYPE_FLOAT:       return 'f';
 	case ATOMIC_TYPE_DOUBLE:      return 'd';
 	}
-	panic("invalid atomic type in mangler");
+	panic("invalid atomic type");
 }
 
 static void mangle_atomic_type(const atomic_type_t *type)
@@ -150,13 +134,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,10 +190,10 @@ 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_ERROR:
 		panic("error type encountered while mangling");
@@ -291,9 +275,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;
@@ -344,8 +325,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;
@@ -373,9 +352,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);