ast2firm: Factorise code to convert a value to its storage type.

[cparser] / mangle.c

diff --git a/mangle.c b/mangle.c
index 780cb90..da43b1a 100644 (file)
--- a/mangle.c
+++ b/mangle.c
@@ -38,7 +38,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 +56,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 +149,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 +205,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");