adapt to latest libfirm

[cparser] / type.c

diff --git a/type.c b/type.c
index f009f36..9e7621e 100644 (file)
--- a/type.c
+++ b/type.c
@@ -33,6 +33,7 @@
 #include "warning.h"
 #include "diagnostic.h"
 #include "printer.h"
+#include "separator_t.h"
 
 /** The default calling convention. */
 cc_kind_t default_calling_convention = CC_CDECL;
@@ -52,6 +53,8 @@ static size_t get_type_struct_size(type_kind_t kind)
 {
        static const size_t sizes[] = {
                [TYPE_ATOMIC]          = sizeof(atomic_type_t),
+               [TYPE_IMAGINARY]       = sizeof(atomic_type_t),
+               [TYPE_COMPLEX]         = sizeof(atomic_type_t),
                [TYPE_COMPOUND_STRUCT] = sizeof(compound_type_t),
                [TYPE_COMPOUND_UNION]  = sizeof(compound_type_t),
                [TYPE_ENUM]            = sizeof(enum_type_t),
@@ -373,15 +376,11 @@ static void print_function_type_post(const function_type_t *type,
                                      const scope_t *parameters)
 {
        print_char('(');
-       bool first = true;
+       separator_t sep = { "", ", " };
        if (parameters == NULL) {
                function_parameter_t *parameter = type->parameters;
                for( ; parameter != NULL; parameter = parameter->next) {
-                       if (first) {
-                               first = false;
-                       } else {
-                               print_string(", ");
-                       }
+                       print_string(sep_next(&sep));
                        print_type(parameter->type);
                }
        } else {
@@ -390,11 +389,7 @@ static void print_function_type_post(const function_type_t *type,
                        if (parameter->kind != ENTITY_PARAMETER)
                                continue;
 
-                       if (first) {
-                               first = false;
-                       } else {
-                               print_string(", ");
-                       }
+                       print_string(sep_next(&sep));
                        const type_t *const param_type = parameter->declaration.type;
                        if (param_type == NULL) {
                                print_string(parameter->base.symbol->string);
@@ -404,14 +399,10 @@ static void print_function_type_post(const function_type_t *type,
                }
        }
        if (type->variadic) {
-               if (first) {
-                       first = false;
-               } else {
-                       print_string(", ");
-               }
+               print_string(sep_next(&sep));
                print_string("...");
        }
-       if (first && !type->unspecified_parameters) {
+       if (sep_at_first(&sep) && !type->unspecified_parameters) {
                print_string("void");
        }
        print_char(')');
@@ -787,16 +778,6 @@ bool is_type_float(const type_t *type)
        return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_FLOAT);
 }
 
-bool is_type_complex(const type_t *type)
-{
-       assert(!is_typeref(type));
-
-       if (type->kind != TYPE_ATOMIC)
-               return false;
-
-       return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_COMPLEX);
-}
-
 bool is_type_signed(const type_t *type)
 {
        assert(!is_typeref(type));
@@ -836,10 +817,16 @@ bool is_type_scalar(const type_t *type)
 {
        assert(!is_typeref(type));
 
-       if (type->kind == TYPE_POINTER)
+       switch(type->kind) {
+       case TYPE_POINTER:
+       case TYPE_ENUM:
                return true;
-
-       return is_type_arithmetic(type);
+       case TYPE_ATOMIC:
+       case TYPE_IMAGINARY:
+               return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_ARITHMETIC);
+       default:
+               return false;
+       }
 }
 
 bool is_type_incomplete(const type_t *type)
@@ -1517,7 +1504,7 @@ next:
                }
        }
 
-       source_position_t const *const pos = &compound->base.source_position;
+       position_t const *const pos = &compound->base.pos;
        if (need_pad) {
                warningf(WARN_PADDED, pos, "'%T' needs padding", type);
        } else if (compound->packed) {