type: Add missing space for printing complex types.
[cparser] / ast.c
diff --git a/ast.c b/ast.c
index e3e4bea..d08da8c 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -26,6 +26,7 @@
 #include "lang_features.h"
 #include "entity_t.h"
 #include "printer.h"
+#include "separator_t.h"
 #include "types.h"
 
 #include <assert.h>
@@ -67,13 +68,6 @@ void print_indent(void)
                print_char('\t');
 }
 
-static void print_stringrep(const string_t *string)
-{
-       for (size_t i = 0; i < string->size; ++i) {
-               print_char(string->begin[i]);
-       }
-}
-
 /**
  * Returns 1 if a given precedence level has right-to-left
  * associativity, else 0.
@@ -197,6 +191,8 @@ static unsigned get_expression_precedence(expression_kind_t kind)
  */
 static void print_quoted_string(const string_t *const string, char border)
 {
+       print_string(get_string_encoding_prefix(string->encoding));
+
        print_char(border);
        const char *end = string->begin + string->size;
        for (const char *c = string->begin; c != end; ++c) {
@@ -233,7 +229,6 @@ static void print_quoted_string(const string_t *const string, char border)
 
 static void print_string_literal(string_literal_expression_t const *const literal, char const delimiter)
 {
-       print_string(get_string_encoding_prefix(literal->encoding));
        print_quoted_string(&literal->value, delimiter);
 }
 
@@ -247,8 +242,7 @@ static void print_literal(const literal_expression_t *literal)
        case EXPR_LITERAL_BOOLEAN:
        case EXPR_LITERAL_FLOATINGPOINT:
        case EXPR_LITERAL_INTEGER:
-               print_stringrep(&literal->value);
-               print_stringrep(&literal->suffix);
+               print_string(literal->value.begin);
                return;
 
        default:
@@ -295,10 +289,9 @@ static void print_call_expression(const call_expression_t *call)
 {
        print_expression_prec(call->function, PREC_POSTFIX);
        print_char('(');
-       char const *sep = "";
+       separator_t sep = { "", ", " };
        for (call_argument_t const *arg = call->arguments; arg; arg = arg->next) {
-               print_string(sep);
-               sep = ", ";
+               print_string(sep_next(&sep));
                print_assignment_expression(arg->expression);
        }
        print_char(')');
@@ -455,8 +448,8 @@ static void print_array_expression(const array_access_expression_t *expression)
 static void print_typeprop_expression(const typeprop_expression_t *expression)
 {
        switch (expression->base.kind) {
-       case EXPR_SIZEOF:  print_string("sizeof");      break;
-       case EXPR_ALIGNOF: print_string("__alignof__"); break;
+       case EXPR_SIZEOF:  print_string("sizeof");                                   break;
+       case EXPR_ALIGNOF: print_string(c_mode & _C11 ? "_Alignof" : "__alignof__"); break;
        default:           panic("invalid typeprop kind");
        }
        if (expression->tp_expression != NULL) {
@@ -954,19 +947,6 @@ static void print_declaration_statement(
        }
 }
 
-/**
- * Print a while statement.
- *
- * @param statement   the statement
- */
-static void print_while_statement(const while_statement_t *statement)
-{
-       print_string("while (");
-       print_expression(statement->condition);
-       print_char(')');
-       print_inner_statement(statement->body);
-}
-
 /**
  * Print a do-while statement.
  *
@@ -989,28 +969,33 @@ static void print_do_while_statement(const do_while_statement_t *statement)
  */
 static void print_for_statement(const for_statement_t *statement)
 {
-       print_string("for (");
-       if (statement->initialisation != NULL) {
-               print_expression(statement->initialisation);
+       if (statement->initialisation || statement->scope.entities || !statement->condition || statement->step) {
+               print_string("for (");
+               if (statement->initialisation != NULL) {
+                       print_expression(statement->initialisation);
+                       print_char(';');
+               } else {
+                       entity_t const *entity = statement->scope.entities;
+                       for (; entity != NULL; entity = entity->base.next) {
+                               if (is_generated_entity(entity))
+                                       continue;
+                               /* FIXME display of multiple declarations is wrong */
+                               print_declaration(entity);
+                       }
+               }
+               if (statement->condition != NULL) {
+                       print_char(' ');
+                       print_expression(statement->condition);
+               }
                print_char(';');
-       } else {
-               entity_t const *entity = statement->scope.entities;
-               for (; entity != NULL; entity = entity->base.next) {
-                       if (is_generated_entity(entity))
-                               continue;
-                       /* FIXME display of multiple declarations is wrong */
-                       print_declaration(entity);
+               if (statement->step != NULL) {
+                       print_char(' ');
+                       print_expression(statement->step);
                }
-       }
-       if (statement->condition != NULL) {
-               print_char(' ');
+       } else {
+               print_string("while (");
                print_expression(statement->condition);
        }
-       print_char(';');
-       if (statement->step != NULL) {
-               print_char(' ');
-               print_expression(statement->step);
-       }
        print_char(')');
        print_inner_statement(statement->body);
 }
@@ -1020,19 +1005,17 @@ static void print_for_statement(const for_statement_t *statement)
  *
  * @param arguments   the arguments
  */
-static void print_asm_arguments(asm_argument_t *arguments)
-{
-       asm_argument_t *argument = arguments;
-       for (; argument != NULL; argument = argument->next) {
-               if (argument != arguments)
-                       print_string(", ");
-
-               if (argument->symbol) {
-                       print_format("[%s] ", argument->symbol->string);
-               }
-               print_quoted_string(&argument->constraints, '"');
+static void print_asm_arguments(asm_argument_t const *const arguments)
+{
+       print_string(" :");
+       separator_t sep = { " ", ", " };
+       for (asm_argument_t const *i = arguments; i; i = i->next) {
+               print_string(sep_next(&sep));
+               if (i->symbol)
+                       print_format("[%s] ", i->symbol->string);
+               print_quoted_string(&i->constraints, '"');
                print_string(" (");
-               print_expression(argument->expression);
+               print_expression(i->expression);
                print_char(')');
        }
 }
@@ -1042,49 +1025,50 @@ static void print_asm_arguments(asm_argument_t *arguments)
  *
  * @param clobbers   the clobbers
  */
-static void print_asm_clobbers(asm_clobber_t *clobbers)
+static void print_asm_clobbers(asm_clobber_t const *const clobbers)
 {
-       asm_clobber_t *clobber = clobbers;
-       for (; clobber != NULL; clobber = clobber->next) {
-               if (clobber != clobbers)
-                       print_string(", ");
+       print_string(" :");
+       separator_t sep = { " ", ", " };
+       for (asm_clobber_t const *i = clobbers; i; i = i->next) {
+               print_string(sep_next(&sep));
+               print_quoted_string(&i->clobber, '"');
+       }
+}
 
-               print_quoted_string(&clobber->clobber, '"');
+static void print_asm_labels(asm_label_t const *const labels)
+{
+       print_string(" :");
+       separator_t sep = { " ", ", " };
+       for (asm_label_t const *i = labels; i; i = i->next) {
+               print_string(sep_next(&sep));
+               print_string(i->label->base.symbol->string);
        }
 }
 
 /**
  * Print an assembler statement.
  *
- * @param statement   the statement
+ * @param stmt   the statement
  */
-static void print_asm_statement(const asm_statement_t *statement)
+static void print_asm_statement(asm_statement_t const *const stmt)
 {
-       print_string("asm ");
-       if (statement->is_volatile) {
-               print_string("volatile ");
-       }
+       print_string("asm");
+       if (stmt->is_volatile) print_string(" volatile");
+       if (stmt->labels)      print_string(" goto");
        print_char('(');
-       print_quoted_string(&statement->asm_text, '"');
-       if (statement->outputs  == NULL &&
-           statement->inputs   == NULL &&
-           statement->clobbers == NULL)
-               goto end_of_print_asm_statement;
-
-       print_string(" : ");
-       print_asm_arguments(statement->outputs);
-       if (statement->inputs == NULL && statement->clobbers == NULL)
-               goto end_of_print_asm_statement;
-
-       print_string(" : ");
-       print_asm_arguments(statement->inputs);
-       if (statement->clobbers == NULL)
-               goto end_of_print_asm_statement;
-
-       print_string(" : ");
-       print_asm_clobbers(statement->clobbers);
-
-end_of_print_asm_statement:
+       print_quoted_string(&stmt->asm_text, '"');
+
+       unsigned const n =
+               stmt->labels   ? 4 :
+               stmt->clobbers ? 3 :
+               stmt->inputs   ? 2 :
+               stmt->outputs  ? 1 :
+               0;
+       if (n >= 1) print_asm_arguments(stmt->outputs);
+       if (n >= 2) print_asm_arguments(stmt->inputs);
+       if (n >= 3) print_asm_clobbers( stmt->clobbers);
+       if (n >= 4) print_asm_labels(   stmt->labels);
+
        print_string(");");
 }
 
@@ -1146,7 +1130,6 @@ void print_statement(statement_t const *const stmt)
        case STATEMENT_MS_TRY:        print_ms_try_statement(       &stmt->ms_try);        break;
        case STATEMENT_RETURN:        print_return_statement(       &stmt->returns);       break;
        case STATEMENT_SWITCH:        print_switch_statement(       &stmt->switchs);       break;
-       case STATEMENT_WHILE:         print_while_statement(        &stmt->whiles);        break;
        }
 }
 
@@ -1181,11 +1164,11 @@ void print_initializer(const initializer_t *initializer)
        }
 
        switch (initializer->kind) {
-       case INITIALIZER_VALUE: {
-               const initializer_value_t *value = &initializer->value;
-               print_assignment_expression(value->value);
+       case INITIALIZER_STRING:
+       case INITIALIZER_VALUE:
+               print_assignment_expression(initializer->value.value);
                return;
-       }
+
        case INITIALIZER_LIST: {
                print_string("{ ");
                const initializer_list_t *list = &initializer->list;
@@ -1202,10 +1185,6 @@ void print_initializer(const initializer_t *initializer)
                return;
        }
 
-       case INITIALIZER_STRING:
-               print_string_literal(get_init_string(initializer), '"');
-               return;
-
        case INITIALIZER_DESIGNATOR:
                print_designator(initializer->designator.designator);
                print_string(" = ");
@@ -1226,26 +1205,20 @@ static void print_ms_modifiers(const declaration_t *declaration)
 
        decl_modifiers_t modifiers = declaration->modifiers;
 
-       bool        ds_shown = false;
-       const char *next     = "(";
+       separator_t sep = { "__declspec(", ", " };
 
        if (declaration->base.kind == ENTITY_VARIABLE) {
                variable_t *variable = (variable_t*)declaration;
                if (variable->alignment != 0
                                || variable->get_property_sym != NULL
                                || variable->put_property_sym != NULL) {
-                       if (!ds_shown) {
-                               print_string("__declspec");
-                               ds_shown = true;
-                       }
-
                        if (variable->alignment != 0) {
-                               print_string(next); next = ", "; print_format("align(%u)", variable->alignment);
+                               print_format("%salign(%u)", sep_next(&sep), variable->alignment);
                        }
                        if (variable->get_property_sym != NULL
                                        || variable->put_property_sym != NULL) {
                                char *comma = "";
-                               print_string(next); next = ", "; print_string("property(");
+                               print_format("%sproperty(", sep_next(&sep));
                                if (variable->get_property_sym != NULL) {
                                        print_format("get=%s", variable->get_property_sym->string);
                                        comma = ", ";
@@ -1259,52 +1232,48 @@ static void print_ms_modifiers(const declaration_t *declaration)
 
        /* DM_FORCEINLINE handled outside. */
        if ((modifiers & ~DM_FORCEINLINE) != 0) {
-               if (!ds_shown) {
-                       print_string("__declspec");
-                       ds_shown = true;
-               }
                if (modifiers & DM_DLLIMPORT) {
-                       print_string(next); next = ", "; print_string("dllimport");
+                       print_format("%sdllimport", sep_next(&sep));
                }
                if (modifiers & DM_DLLEXPORT) {
-                       print_string(next); next = ", "; print_string("dllexport");
+                       print_format("%sdllexport", sep_next(&sep));
                }
                if (modifiers & DM_THREAD) {
-                       print_string(next); next = ", "; print_string("thread");
+                       print_format("%sthread", sep_next(&sep));
                }
                if (modifiers & DM_NAKED) {
-                       print_string(next); next = ", "; print_string("naked");
+                       print_format("%snaked", sep_next(&sep));
                }
                if (modifiers & DM_THREAD) {
-                       print_string(next); next = ", "; print_string("thread");
+                       print_format("%sthread", sep_next(&sep));
                }
                if (modifiers & DM_SELECTANY) {
-                       print_string(next); next = ", "; print_string("selectany");
+                       print_format("%sselectany", sep_next(&sep));
                }
                if (modifiers & DM_NOTHROW) {
-                       print_string(next); next = ", "; print_string("nothrow");
+                       print_format("%snothrow", sep_next(&sep));
                }
                if (modifiers & DM_NORETURN) {
-                       print_string(next); next = ", "; print_string("noreturn");
+                       print_format("%snoreturn", sep_next(&sep));
                }
                if (modifiers & DM_NOINLINE) {
-                       print_string(next); next = ", "; print_string("noinline");
+                       print_format("%snoinline", sep_next(&sep));
                }
                if (modifiers & DM_DEPRECATED) {
-                       print_string(next); next = ", "; print_string("deprecated");
+                       print_format("%sdeprecated", sep_next(&sep));
                        if (declaration->deprecated_string != NULL)
                                print_format("(\"%s\")",
                                        declaration->deprecated_string);
                }
                if (modifiers & DM_RESTRICT) {
-                       print_string(next); next = ", "; print_string("restrict");
+                       print_format("%srestrict", sep_next(&sep));
                }
                if (modifiers & DM_NOALIAS) {
-                       print_string(next); next = ", "; print_string("noalias");
+                       print_format("%snoalias", sep_next(&sep));
                }
        }
 
-       if (ds_shown)
+       if (!sep_at_first(&sep))
                print_string(") ");
 }
 #endif
@@ -1364,9 +1333,9 @@ void print_declaration(const entity_t *entity)
                        print_type_ext(entity->declaration.type, entity->base.symbol,
                                        &entity->function.parameters);
 
-                       if (entity->function.statement != NULL) {
+                       if (entity->function.body != NULL) {
                                print_char('\n');
-                               print_indented_statement(entity->function.statement);
+                               print_indented_statement(entity->function.body);
                                print_char('\n');
                                return;
                        }
@@ -1374,7 +1343,7 @@ void print_declaration(const entity_t *entity)
 
                case ENTITY_VARIABLE:
                        if (entity->variable.thread_local)
-                               print_string("__thread ");
+                               print_string(c_mode & _C11 ? "_Thread_local " : "__thread ");
                        print_type_ext(declaration->type, declaration->base.symbol, NULL);
                        if (entity->variable.initializer != NULL) {
                                print_string(" = ");
@@ -1529,6 +1498,14 @@ static expression_classification_t is_object_with_linker_constant_address(
        case EXPR_UNARY_DEREFERENCE:
                return is_linker_constant(expression->unary.value);
 
+       case EXPR_COMPOUND_LITERAL: {
+               const compound_literal_expression_t *literal
+                       = &expression->compound_literal;
+               return literal->global_scope ||
+                      ((literal->type->base.qualifiers & TYPE_QUALIFIER_CONST)
+                       && is_constant_initializer(literal->initializer));
+       }
+
        case EXPR_SELECT: {
                type_t *base_type = skip_typeref(expression->select.compound->base.type);
                if (is_type_pointer(base_type)) {
@@ -1772,21 +1749,45 @@ static expression_classification_t is_object_with_constant_address(const express
 expression_classification_t is_constant_expression(const expression_t *expression)
 {
        switch (expression->kind) {
-       case EXPR_LITERAL_CASES:
        case EXPR_LITERAL_CHARACTER:
-       case EXPR_CLASSIFY_TYPE:
-       case EXPR_OFFSETOF:
-       case EXPR_ALIGNOF:
-       case EXPR_BUILTIN_CONSTANT_P:
        case EXPR_BUILTIN_TYPES_COMPATIBLE_P:
        case EXPR_ENUM_CONSTANT:
+       case EXPR_LITERAL_BOOLEAN:
+       case EXPR_LITERAL_MS_NOOP:
                return EXPR_CLASS_CONSTANT;
 
-       case EXPR_SIZEOF: {
-               type_t *const type = skip_typeref(expression->typeprop.type);
-               return
-                       !is_type_array(type) || !type->array.is_vla ? EXPR_CLASS_CONSTANT :
-                       EXPR_CLASS_VARIABLE;
+       {
+               type_t *type;
+       case EXPR_ALIGNOF:
+               type = skip_typeref(expression->typeprop.type);
+               goto check_type;
+
+       case EXPR_CLASSIFY_TYPE:
+               type = skip_typeref(expression->classify_type.type_expression->base.type);
+               goto check_type;
+
+       case EXPR_LITERAL_INTEGER:
+       case EXPR_LITERAL_FLOATINGPOINT:
+               type = skip_typeref(expression->base.type);
+               goto check_type;
+
+       case EXPR_OFFSETOF:
+               type = skip_typeref(expression->offsetofe.type);
+               goto check_type;
+
+       case EXPR_SIZEOF:
+               type = skip_typeref(expression->typeprop.type);
+               if (is_type_array(type) && type->array.is_vla)
+                       return EXPR_CLASS_VARIABLE;
+               goto check_type;
+
+check_type:
+               return is_type_valid(type) ? EXPR_CLASS_CONSTANT : EXPR_CLASS_ERROR;
+       }
+
+       case EXPR_BUILTIN_CONSTANT_P: {
+               expression_classification_t const c = is_constant_expression(expression->builtin_constant.value);
+               return c != EXPR_CLASS_ERROR ? EXPR_CLASS_CONSTANT : EXPR_CLASS_ERROR;
        }
 
        case EXPR_STRING_LITERAL:
@@ -1914,7 +1915,7 @@ expression_classification_t is_constant_expression(const expression_t *expressio
        case EXPR_ERROR:
                return EXPR_CLASS_ERROR;
        }
-       panic("invalid expression found (is constant expression)");
+       panic("invalid expression");
 }
 
 void init_ast(void)