fix printing of array types
[cparser] / type.c
diff --git a/type.c b/type.c
index 4c1612c..365b3fe 100644 (file)
--- a/type.c
+++ b/type.c
@@ -46,7 +46,6 @@ void print_type_qualifiers(unsigned qualifiers)
        if(qualifiers & TYPE_QUALIFIER_CONST)    fputs("const ",    out);
        if(qualifiers & TYPE_QUALIFIER_VOLATILE) fputs("volatile ", out);
        if(qualifiers & TYPE_QUALIFIER_RESTRICT) fputs("restrict ", out);
-       if(qualifiers & TYPE_QUALIFIER_INLINE)   fputs("inline ",   out);
 }
 
 static
@@ -78,8 +77,7 @@ void print_atomic_type(const atomic_type_t *type)
        fputs(s, out);
 }
 
-static
-void print_method_type_pre(const method_type_t *type)
+static void print_function_type_pre(const function_type_t *type)
 {
        print_type_qualifiers(type->type.qualifiers);
 
@@ -89,8 +87,8 @@ void print_method_type_pre(const method_type_t *type)
        fputc('(', out);
 }
 
-static
-void print_method_type_post(const method_type_t *type, const context_t *context)
+static void print_function_type_post(const function_type_t *type,
+                                     const context_t *context)
 {
        /* TODO: don't emit braces if we're the toplevel type... */
        intern_print_type_post(type->result_type);
@@ -100,7 +98,7 @@ void print_method_type_post(const method_type_t *type, const context_t *context)
 
        int                 first     = 1;
        if(context == NULL) {
-               method_parameter_t *parameter = type->parameters;
+               function_parameter_t *parameter = type->parameters;
                for( ; parameter != NULL; parameter = parameter->next) {
                        if(first) {
                                first = 0;
@@ -111,7 +109,7 @@ void print_method_type_post(const method_type_t *type, const context_t *context)
                }
        } else {
                declaration_t *parameter = context->declarations;
-               for( ; parameter != NULL; parameter = parameter->context_next) {
+               for( ; parameter != NULL; parameter = parameter->next) {
                        if(first) {
                                first = 0;
                        } else {
@@ -135,8 +133,7 @@ void print_method_type_post(const method_type_t *type, const context_t *context)
        fputc(')', out);
 }
 
-static
-void print_pointer_type_pre(const pointer_type_t *type)
+static void print_pointer_type_pre(const pointer_type_t *type)
 {
        intern_print_type_pre(type->points_to);
        fputs("*", out);
@@ -148,8 +145,14 @@ static void print_pointer_type_post(const pointer_type_t *type)
        intern_print_type_post(type->points_to);
 }
 
+static void print_array_type_pre(const array_type_t *type)
+{
+       intern_print_type_pre(type->element_type);
+}
+
 static void print_array_type_post(const array_type_t *type)
 {
+       intern_print_type_post(type->element_type);
        fputc('[', out);
        if(type->is_static) {
                fputs("static ", out);
@@ -167,15 +170,15 @@ void print_enum_definition(const declaration_t *declaration)
 
        change_indent(1);
 
-       declaration_t *entry = declaration->context_next;
+       declaration_t *entry = declaration->next;
        for( ; entry != NULL && entry->storage_class == STORAGE_CLASS_ENUM_ENTRY;
-              entry = entry->context_next) {
+              entry = entry->next) {
 
                print_indent();
                fprintf(out, "%s", entry->symbol->string);
                if(entry->init.initializer != NULL) {
                        fprintf(out, " = ");
-                       print_initializer(entry->init.initializer);
+                       print_expression(entry->init.enum_value);
                }
                fprintf(out, ",\n");
        }
@@ -205,7 +208,7 @@ void print_compound_definition(const declaration_t *declaration)
        change_indent(1);
 
        declaration_t *iter = declaration->context.declarations;
-       for( ; iter != NULL; iter = iter->context_next) {
+       for( ; iter != NULL; iter = iter->next) {
                print_indent();
                print_declaration(iter);
                fputc('\n', out);
@@ -272,13 +275,14 @@ static void intern_print_type_pre(type_t *type)
        case TYPE_BUILTIN:
                fputs(((builtin_type_t*) type)->symbol->string, out);
                return;
-       case TYPE_METHOD:
-               print_method_type_pre((method_type_t*) type);
+       case TYPE_FUNCTION:
+               print_function_type_pre((function_type_t*) type);
                return;
        case TYPE_POINTER:
                print_pointer_type_pre((pointer_type_t*) type);
                return;
        case TYPE_ARRAY:
+               print_array_type_pre((array_type_t*) type);
                return;
        case TYPE_TYPEDEF:
                print_typedef_type_pre((typedef_type_t*) type);
@@ -290,12 +294,11 @@ static void intern_print_type_pre(type_t *type)
        fputs("unknown", out);
 }
 
-static
-void intern_print_type_post(type_t *type)
+static void intern_print_type_post(type_t *type)
 {
        switch(type->type) {
-       case TYPE_METHOD:
-               print_method_type_post((const method_type_t*) type, NULL);
+       case TYPE_FUNCTION:
+               print_function_type_post((const function_type_t*) type, NULL);
                return;
        case TYPE_POINTER:
                print_pointer_type_post((const pointer_type_t*) type);
@@ -333,8 +336,8 @@ void print_type_ext(type_t *type, const symbol_t *symbol,
                fputc(' ', out);
                fputs(symbol->string, out);
        }
-       if(type->type == TYPE_METHOD) {
-               print_method_type_post((const method_type_t*) type, context);
+       if(type->type == TYPE_FUNCTION) {
+               print_function_type_post((const function_type_t*) type, context);
        } else {
                intern_print_type_post(type);
        }
@@ -348,10 +351,10 @@ bool type_valid(const type_t *type)
 bool is_type_integer(const type_t *type)
 {
        if(type->type == TYPE_ENUM)
-               return 1;
+               return true;
 
        if(type->type != TYPE_ATOMIC)
-               return 0;
+               return false;
 
        atomic_type_t *atomic_type = (atomic_type_t*) type;
        switch(atomic_type->atype) {
@@ -367,16 +370,16 @@ bool is_type_integer(const type_t *type)
        case ATOMIC_TYPE_ULONG:
        case ATOMIC_TYPE_LONGLONG:
        case ATOMIC_TYPE_ULONGLONG:
-               return 1;
+               return true;
        default:
-               return 0;
+               return false;
        }
 }
 
 bool is_type_floating(const type_t *type)
 {
        if(type->type != TYPE_ATOMIC)
-               return 0;
+               return false;
 
        atomic_type_t *atomic_type = (atomic_type_t*) type;
        switch(atomic_type->atype) {
@@ -387,18 +390,63 @@ bool is_type_floating(const type_t *type)
        case ATOMIC_TYPE_FLOAT_COMPLEX:
        case ATOMIC_TYPE_DOUBLE_COMPLEX:
        case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX:
-#endif
-#ifdef PROVIDE_IMAGINARY
        case ATOMIC_TYPE_FLOAT_IMAGINARY:
        case ATOMIC_TYPE_DOUBLE_IMAGINARY:
        case ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY:
 #endif
-               return 1;
+               return true;
        default:
-               return 0;
+               return false;
        }
 }
 
+bool is_type_signed(const type_t *type)
+{
+       /* enum types are int for now */
+       if(type->type == TYPE_ENUM)
+               return true;
+
+       if(type->type != TYPE_ATOMIC)
+               return false;
+
+       atomic_type_t *atomic_type = (atomic_type_t*) type;
+       switch(atomic_type->atype) {
+       case ATOMIC_TYPE_CHAR:
+       case ATOMIC_TYPE_SCHAR:
+       case ATOMIC_TYPE_SHORT:
+       case ATOMIC_TYPE_INT:
+       case ATOMIC_TYPE_LONG:
+       case ATOMIC_TYPE_LONGLONG:
+       case ATOMIC_TYPE_FLOAT:
+       case ATOMIC_TYPE_DOUBLE:
+       case ATOMIC_TYPE_LONG_DOUBLE:
+#ifdef PROVIDE_COMPLEX
+       case ATOMIC_TYPE_FLOAT_COMPLEX:
+       case ATOMIC_TYPE_DOUBLE_COMPLEX:
+       case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX:
+       case ATOMIC_TYPE_FLOAT_IMAGINARY:
+       case ATOMIC_TYPE_DOUBLE_IMAGINARY:
+       case ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY:
+#endif
+               return true;
+
+       case ATOMIC_TYPE_BOOL:
+       case ATOMIC_TYPE_UCHAR:
+       case ATOMIC_TYPE_USHORT:
+       case ATOMIC_TYPE_UINT:
+       case ATOMIC_TYPE_ULONG:
+       case ATOMIC_TYPE_ULONGLONG:
+               return false;
+
+       case ATOMIC_TYPE_INVALID:
+       case ATOMIC_TYPE_VOID:
+               return false;
+       }
+
+       panic("invalid atomic type found");
+       return false;
+}
+
 bool is_type_arithmetic(const type_t *type)
 {
        if(is_type_integer(type) || is_type_floating(type))
@@ -415,6 +463,87 @@ bool is_type_scalar(const type_t *type)
        return is_type_arithmetic(type);
 }
 
+bool is_type_incomplete(const type_t *type)
+{
+       switch(type->type) {
+       case TYPE_COMPOUND_STRUCT:
+       case TYPE_COMPOUND_UNION: {
+               const compound_type_t *compound_type
+                       = (const compound_type_t*) type;
+               declaration_t *declaration = compound_type->declaration;
+               return !declaration->init.is_defined;
+       }
+       case TYPE_FUNCTION:
+               return true;
+
+       case TYPE_ARRAY:
+       case TYPE_ATOMIC:
+       case TYPE_POINTER:
+       case TYPE_ENUM:
+               return false;
+
+       case TYPE_TYPEDEF:
+       case TYPE_TYPEOF:
+       case TYPE_BUILTIN:
+               panic("is_type_incomplete called without typerefs skipped");
+       case TYPE_INVALID:
+               break;
+       }
+
+       panic("invalid type found");
+}
+
+bool types_compatible(const type_t *type1, const type_t *type2)
+{
+       (void) type1;
+       (void) type2;
+       return true;
+}
+
+bool pointers_compatible(const type_t *type1, const type_t *type2)
+{
+       assert(type1->type == TYPE_POINTER);
+       assert(type2->type == TYPE_POINTER);
+       pointer_type_t *pointer_type1 = (pointer_type_t*) type1;
+       pointer_type_t *pointer_type2 = (pointer_type_t*) type2;
+       return types_compatible(pointer_type1->points_to,
+                               pointer_type2->points_to);
+}
+
+type_t *skip_typeref(type_t *type)
+{
+       while(1) {
+               switch(type->type) {
+               case TYPE_TYPEDEF: {
+                       const typedef_type_t *typedef_type = (const typedef_type_t*) type;
+                       type = typedef_type->declaration->type;
+                       continue;
+               }
+               case TYPE_TYPEOF: {
+                       const typeof_type_t *typeof_type = (const typeof_type_t *) type;
+                       if(typeof_type->typeof_type != NULL) {
+                               type = typeof_type->typeof_type;
+                       } else {
+                               type = typeof_type->expression->datatype;
+                       }
+                       continue;
+               }
+               case TYPE_BUILTIN: {
+                       const builtin_type_t *builtin_type = (const builtin_type_t*) type;
+                       type = builtin_type->real_type;
+                       continue;
+               }
+               default:
+                       break;
+               }
+               break;
+       }
+
+       return type;
+}
+
+
+
 static type_t *identify_new_type(type_t *type)
 {
        type_t *result = typehash_insert(type);