Slightly simplify creating an ident from a string on an obstack.
[cparser] / type.c
diff --git a/type.c b/type.c
index bab541f..3ab686d 100644 (file)
--- a/type.c
+++ b/type.c
@@ -23,6 +23,7 @@
 #include <assert.h>
 
 #include "type_t.h"
+#include "entity_t.h"
 #include "symbol_t.h"
 #include "type_hash.h"
 #include "adt/error.h"
@@ -173,7 +174,9 @@ void init_types(void)
        props[ATOMIC_TYPE_LONGLONG].alignment    = 4;
        props[ATOMIC_TYPE_ULONGLONG].alignment   = 4;
 
-       props[ATOMIC_TYPE_BOOL] = props[ATOMIC_TYPE_UINT];
+       /* TODO: make this configurable for platforms which do not use byte sized
+        * bools. */
+       props[ATOMIC_TYPE_BOOL] = props[ATOMIC_TYPE_UCHAR];
 }
 
 void exit_types(void)
@@ -208,34 +211,38 @@ void print_type_qualifiers(type_qualifiers_t qualifiers)
        }
 }
 
+const char *get_atomic_kind_name(atomic_type_kind_t kind)
+{
+       switch(kind) {
+       case ATOMIC_TYPE_INVALID: break;
+       case ATOMIC_TYPE_VOID:        return "void";
+       case ATOMIC_TYPE_BOOL:        return c_mode & _CXX ? "bool" : "_Bool";
+       case ATOMIC_TYPE_CHAR:        return "char";
+       case ATOMIC_TYPE_SCHAR:       return "signed char";
+       case ATOMIC_TYPE_UCHAR:       return "unsigned char";
+       case ATOMIC_TYPE_INT:         return "int";
+       case ATOMIC_TYPE_UINT:        return "unsigned int";
+       case ATOMIC_TYPE_SHORT:       return "short";
+       case ATOMIC_TYPE_USHORT:      return "unsigned short";
+       case ATOMIC_TYPE_LONG:        return "long";
+       case ATOMIC_TYPE_ULONG:       return "unsigned long";
+       case ATOMIC_TYPE_LONGLONG:    return "long long";
+       case ATOMIC_TYPE_ULONGLONG:   return "unsigned long long";
+       case ATOMIC_TYPE_LONG_DOUBLE: return "long double";
+       case ATOMIC_TYPE_FLOAT:       return "float";
+       case ATOMIC_TYPE_DOUBLE:      return "double";
+       }
+       return "INVALIDATOMIC";
+}
+
 /**
  * Prints the name of an atomic type kinds.
  *
  * @param kind  The type kind.
  */
-static
-void print_atomic_kinds(atomic_type_kind_t kind)
+static void print_atomic_kinds(atomic_type_kind_t kind)
 {
-       const char *s = "INVALIDATOMIC";
-       switch(kind) {
-       case ATOMIC_TYPE_INVALID:                               break;
-       case ATOMIC_TYPE_VOID:        s = "void";               break;
-       case ATOMIC_TYPE_BOOL:        s = "_Bool";              break;
-       case ATOMIC_TYPE_CHAR:        s = "char";               break;
-       case ATOMIC_TYPE_SCHAR:       s = "signed char";        break;
-       case ATOMIC_TYPE_UCHAR:       s = "unsigned char";      break;
-       case ATOMIC_TYPE_INT:         s = "int";                break;
-       case ATOMIC_TYPE_UINT:        s = "unsigned int";       break;
-       case ATOMIC_TYPE_SHORT:       s = "short";              break;
-       case ATOMIC_TYPE_USHORT:      s = "unsigned short";     break;
-       case ATOMIC_TYPE_LONG:        s = "long";               break;
-       case ATOMIC_TYPE_ULONG:       s = "unsigned long";      break;
-       case ATOMIC_TYPE_LONGLONG:    s = "long long";          break;
-       case ATOMIC_TYPE_ULONGLONG:   s = "unsigned long long"; break;
-       case ATOMIC_TYPE_LONG_DOUBLE: s = "long double";        break;
-       case ATOMIC_TYPE_FLOAT:       s = "float";              break;
-       case ATOMIC_TYPE_DOUBLE:      s = "double";             break;
-       }
+       const char *s = get_atomic_kind_name(kind);
        fputs(s, out);
 }
 
@@ -244,8 +251,7 @@ void print_atomic_kinds(atomic_type_kind_t kind)
  *
  * @param type  The type.
  */
-static
-void print_atomic_type(const atomic_type_t *type)
+static void print_atomic_type(const atomic_type_t *type)
 {
        print_type_qualifiers(type->base.qualifiers);
        if (type->base.qualifiers != 0)
@@ -289,28 +295,33 @@ void print_imaginary_type(const imaginary_type_t *type)
  */
 static void print_function_type_pre(const function_type_t *type, bool top)
 {
+       switch (type->linkage) {
+               case LINKAGE_INVALID:
+                       break;
+
+               case LINKAGE_C:
+                       if (c_mode & _CXX)
+                               fputs("extern \"C\" ",   out);
+                       break;
+
+               case LINKAGE_CXX:
+                       if (!(c_mode & _CXX))
+                               fputs("extern \"C++\" ", out);
+                       break;
+       }
+
        print_type_qualifiers(type->base.qualifiers);
        if (type->base.qualifiers != 0)
                fputc(' ', out);
 
-
        intern_print_type_pre(type->return_type, false);
 
        switch (type->calling_convention) {
-       case CC_CDECL:
-               fputs("__cdecl ", out);
-               break;
-       case CC_STDCALL:
-               fputs("__stdcall ", out);
-               break;
-       case CC_FASTCALL:
-               fputs("__fastcall ", out);
-               break;
-       case CC_THISCALL:
-               fputs("__thiscall ", out);
-               break;
-       case CC_DEFAULT:
-               break;
+       case CC_CDECL:    fputs("__cdecl ",    out); break;
+       case CC_STDCALL:  fputs("__stdcall ",  out); break;
+       case CC_FASTCALL: fputs("__fastcall ", out); break;
+       case CC_THISCALL: fputs("__thiscall ", out); break;
+       case CC_DEFAULT:  break;
        }
 
        /* don't emit parenthesis if we're the toplevel type... */
@@ -325,7 +336,7 @@ static void print_function_type_pre(const function_type_t *type, bool top)
  * @param top    true, if this is the top type, false if it's an embedded type.
  */
 static void print_function_type_post(const function_type_t *type,
-                                     const scope_t *scope, bool top)
+                                     const scope_t *parameters, bool top)
 {
        /* don't emit parenthesis if we're the toplevel type... */
        if (!top)
@@ -333,7 +344,7 @@ static void print_function_type_post(const function_type_t *type,
 
        fputc('(', out);
        bool first = true;
-       if (scope == NULL) {
+       if (parameters == NULL) {
                function_parameter_t *parameter = type->parameters;
                for( ; parameter != NULL; parameter = parameter->next) {
                        if (first) {
@@ -344,15 +355,16 @@ static void print_function_type_post(const function_type_t *type,
                        print_type(parameter->type);
                }
        } else {
-               declaration_t *parameter = scope->declarations;
-               for( ; parameter != NULL; parameter = parameter->next) {
+               entity_t *parameter = parameters->entities;
+               for( ; parameter != NULL; parameter = parameter->base.next) {
                        if (first) {
                                first = false;
                        } else {
                                fputs(", ", out);
                        }
-                       print_type_ext(parameter->type, parameter->symbol,
-                                      &parameter->scope);
+                       assert(is_declaration(parameter));
+                       print_type_ext(parameter->declaration.type, parameter->base.symbol,
+                                      NULL);
                }
        }
        if (type->variadic) {
@@ -435,7 +447,7 @@ static void print_array_type_post(const array_type_t *type)
 static void print_bitfield_type_post(const bitfield_type_t *type)
 {
        fputs(" : ", out);
-       print_expression(type->size);
+       print_expression(type->size_expression);
        intern_print_type_post(type->base_type, false);
 }
 
@@ -444,23 +456,23 @@ static void print_bitfield_type_post(const bitfield_type_t *type)
  *
  * @param declaration  The enum's type declaration.
  */
-void print_enum_definition(const declaration_t *declaration)
+void print_enum_definition(const enum_t *enume)
 {
        fputs("{\n", out);
 
        change_indent(1);
 
-       declaration_t *entry = declaration->next;
-       for( ; entry != NULL && entry->storage_class == STORAGE_CLASS_ENUM_ENTRY;
-              entry = entry->next) {
+       entity_t *entry = enume->base.next;
+       for( ; entry != NULL && entry->kind == ENTITY_ENUM_VALUE;
+              entry = entry->base.next) {
 
                print_indent();
-               fprintf(out, "%s", entry->symbol->string);
-               if (entry->init.initializer != NULL) {
+               fprintf(out, "%s", entry->base.symbol->string);
+               if (entry->enum_value.value != NULL) {
                        fprintf(out, " = ");
 
                        /* skip the implicit cast */
-                       expression_t *expression = entry->init.enum_value;
+                       expression_t *expression = entry->enum_value.value;
                        if (expression->kind == EXPR_UNARY_CAST_IMPLICIT) {
                                expression = expression->unary.value;
                        }
@@ -485,29 +497,30 @@ static void print_type_enum(const enum_type_t *type)
        print_type_qualifiers(type->base.qualifiers);
        fputs(" enum " + empty, out);
 
-       declaration_t *declaration = type->declaration;
-       symbol_t      *symbol      = declaration->symbol;
+       enum_t   *enume  = type->enume;
+       symbol_t *symbol = enume->base.symbol;
        if (symbol != NULL) {
                fputs(symbol->string, out);
        } else {
-               print_enum_definition(declaration);
+               print_enum_definition(enume);
        }
 }
 
 /**
  * Print the compound part of a compound type.
- *
- * @param declaration  The declaration of the compound type.
  */
-void print_compound_definition(const declaration_t *declaration)
+void print_compound_definition(const compound_t *compound)
 {
        fputs("{\n", out);
        change_indent(1);
 
-       declaration_t *iter = declaration->scope.declarations;
-       for( ; iter != NULL; iter = iter->next) {
+       entity_t *entity = compound->members.entities;
+       for( ; entity != NULL; entity = entity->base.next) {
+               if (entity->kind != ENTITY_COMPOUND_MEMBER)
+                       continue;
+
                print_indent();
-               print_declaration(iter);
+               print_entity(entity);
                fputc('\n', out);
        }
 
@@ -533,12 +546,12 @@ static void print_compound_type(const compound_type_t *type)
                fputs(" union " + empty, out);
        }
 
-       declaration_t *declaration = type->declaration;
-       symbol_t      *symbol      = declaration->symbol;
+       compound_t *compound = type->compound;
+       symbol_t   *symbol   = compound->base.symbol;
        if (symbol != NULL) {
                fputs(symbol->string, out);
        } else {
-               print_compound_definition(declaration);
+               print_compound_definition(compound);
        }
 }
 
@@ -552,7 +565,7 @@ static void print_typedef_type_pre(const typedef_type_t *const type)
        print_type_qualifiers(type->base.qualifiers);
        if (type->base.qualifiers != 0)
                fputc(' ', out);
-       fputs(type->declaration->symbol->string, out);
+       fputs(type->typedefe->base.symbol->string, out);
 }
 
 /**
@@ -675,7 +688,7 @@ void print_type(const type_t *const type)
 }
 
 void print_type_ext(const type_t *const type, const symbol_t *symbol,
-                    const scope_t *scope)
+                    const scope_t *parameters)
 {
        if (type == NULL) {
                fputs("nil type", out);
@@ -688,7 +701,7 @@ void print_type_ext(const type_t *const type, const symbol_t *symbol,
                fputs(symbol->string, out);
        }
        if (type->kind == TYPE_FUNCTION) {
-               print_function_type_post(&type->function, scope, true);
+               print_function_type_post(&type->function, parameters, true);
        } else {
                intern_print_type_post(type, true);
        }
@@ -747,6 +760,8 @@ type_t *duplicate_type(const type_t *type)
  */
 type_t *get_unqualified_type(type_t *type)
 {
+       assert(!is_typeref(type));
+
        if (type->base.qualifiers == TYPE_QUALIFIER_NONE)
                return type;
 
@@ -776,12 +791,14 @@ type_t *get_qualified_type(type_t *orig_type, type_qualifiers_t const qual)
 
                copy                     = duplicate_type(type);
                copy->array.element_type = qual_element_type;
-       } else {
+       } else if (is_type_valid(type)) {
                if ((type->base.qualifiers & qual) == qual)
                        return orig_type;
 
                copy                   = duplicate_type(type);
                copy->base.qualifiers |= qual;
+       } else {
+               return type;
        }
 
        type = typehash_insert(copy);
@@ -929,9 +946,8 @@ bool is_type_arithmetic(const type_t *type)
  */
 bool is_type_real(const type_t *type)
 {
-       /* 6.2.5.17 */
-       return is_type_integer(type)
-               || (type->kind == TYPE_ATOMIC && is_type_float(type));
+       /* 6.2.5 (17) */
+       return is_type_integer(type) || is_type_float(type);
 }
 
 /**
@@ -967,14 +983,10 @@ bool is_type_incomplete(const type_t *type)
        case TYPE_COMPOUND_STRUCT:
        case TYPE_COMPOUND_UNION: {
                const compound_type_t *compound_type = &type->compound;
-               declaration_t         *declaration   = compound_type->declaration;
-               return !declaration->init.complete;
-       }
-       case TYPE_ENUM: {
-               const enum_type_t *enum_type   = &type->enumt;
-               declaration_t     *declaration = enum_type->declaration;
-               return !declaration->init.complete;
+               return !compound_type->compound->complete;
        }
+       case TYPE_ENUM:
+               return false;
 
        case TYPE_ARRAY:
                return type->array.size_expression == NULL
@@ -1022,6 +1034,12 @@ static bool function_types_compatible(const function_type_t *func1,
        if (!types_compatible(ret1, ret2))
                return false;
 
+       if (func1->linkage != func2->linkage)
+               return false;
+
+       if (func1->calling_convention != func2->calling_convention)
+               return false;
+
        /* can parameters be compared? */
        if (func1->unspecified_parameters || func2->unspecified_parameters)
                return true;
@@ -1029,9 +1047,6 @@ static bool function_types_compatible(const function_type_t *func1,
        if (func1->variadic != func2->variadic)
                return false;
 
-       if (func1->calling_convention != func2->calling_convention)
-               return false;
-
        /* TODO: handling of unspecified parameters not correct yet */
 
        /* all argument types must be compatible */
@@ -1156,7 +1171,7 @@ type_t *skip_typeref(type_t *type)
                                type = typedef_type->resolved_type;
                                break;
                        }
-                       type = typedef_type->declaration->type;
+                       type = typedef_type->typedefe->type;
                        continue;
                }
                case TYPE_TYPEOF: {
@@ -1199,6 +1214,44 @@ type_t *skip_typeref(type_t *type)
        return type;
 }
 
+type_qualifiers_t get_type_qualifier(const type_t *type, bool skip_array_type) {
+       type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE;
+
+       while (true) {
+               switch (type->base.kind) {
+               case TYPE_ERROR:
+                       return TYPE_QUALIFIER_NONE;
+               case TYPE_TYPEDEF:
+                       qualifiers |= type->base.qualifiers;
+                       const typedef_type_t *typedef_type = &type->typedeft;
+                       if (typedef_type->resolved_type != NULL)
+                               type = typedef_type->resolved_type;
+                       else
+                               type = typedef_type->typedefe->type;
+                       continue;
+               case TYPE_TYPEOF: {
+                       const typeof_type_t *typeof_type = &type->typeoft;
+                       if (typeof_type->typeof_type != NULL) {
+                               type = typeof_type->typeof_type;
+                       } else {
+                               type = typeof_type->expression->base.type;
+                       }
+                       continue;
+               }
+               case TYPE_ARRAY:
+                       if (skip_array_type) {
+                               type = type->array.element_type;
+                               continue;
+                       }
+                       break;
+               default:
+                       break;
+               }
+               break;
+       }
+       return type->base.qualifiers | qualifiers;
+}
+
 unsigned get_atomic_type_size(atomic_type_kind_t kind)
 {
        assert(kind <= ATOMIC_TYPE_LAST);