Implement -Wshadow.
[cparser] / ast.c
diff --git a/ast.c b/ast.c
index 4621294..ac8caeb 100644 (file)
--- a/ast.c
+++ b/ast.c
 #include <stdlib.h>
 #include <ctype.h>
 
-#ifdef __INTEL_COMPILER
+#if defined(__INTEL_COMPILER)
 #include <mathimf.h>
+#elif defined(__CYGWIN__)
+#include "win32/cygwin_math_ext.h"
 #else
 #include <math.h>
 #endif
 
 #include "adt/error.h"
+#include "adt/util.h"
 
 struct obstack ast_obstack;
 
@@ -92,91 +95,90 @@ static int right_to_left(unsigned precedence)
 static unsigned get_expression_precedence(expression_kind_t kind)
 {
        static const unsigned prec[] = {
-               [EXPR_UNKNOWN]                   = PREC_PRIMARY,
-               [EXPR_INVALID]                   = PREC_PRIMARY,
-               [EXPR_REFERENCE]                 = PREC_PRIMARY,
-               [EXPR_REFERENCE_ENUM_VALUE]      = PREC_PRIMARY,
-               [EXPR_CHARACTER_CONSTANT]        = PREC_PRIMARY,
-               [EXPR_WIDE_CHARACTER_CONSTANT]   = PREC_PRIMARY,
-               [EXPR_CONST]                     = PREC_PRIMARY,
-               [EXPR_STRING_LITERAL]            = PREC_PRIMARY,
-               [EXPR_WIDE_STRING_LITERAL]       = PREC_PRIMARY,
-               [EXPR_COMPOUND_LITERAL]          = PREC_UNARY,
-               [EXPR_CALL]                      = PREC_POSTFIX,
-               [EXPR_CONDITIONAL]               = PREC_CONDITIONAL,
-               [EXPR_SELECT]                    = PREC_POSTFIX,
-               [EXPR_ARRAY_ACCESS]              = PREC_POSTFIX,
-               [EXPR_SIZEOF]                    = PREC_UNARY,
-               [EXPR_CLASSIFY_TYPE]             = PREC_UNARY,
-               [EXPR_ALIGNOF]                   = PREC_UNARY,
-
-               [EXPR_FUNCNAME]                  = PREC_PRIMARY,
-               [EXPR_BUILTIN_SYMBOL]            = PREC_PRIMARY,
-               [EXPR_BUILTIN_CONSTANT_P]        = PREC_PRIMARY,
-               [EXPR_BUILTIN_PREFETCH]          = PREC_PRIMARY,
-               [EXPR_OFFSETOF]                  = PREC_PRIMARY,
-               [EXPR_VA_START]                  = PREC_PRIMARY,
-               [EXPR_VA_ARG]                    = PREC_PRIMARY,
-               [EXPR_STATEMENT]                 = PREC_PRIMARY,
-               [EXPR_LABEL_ADDRESS]             = PREC_PRIMARY,
-
-               [EXPR_UNARY_NEGATE]              = PREC_UNARY,
-               [EXPR_UNARY_PLUS]                = PREC_UNARY,
-               [EXPR_UNARY_BITWISE_NEGATE]      = PREC_UNARY,
-               [EXPR_UNARY_NOT]                 = PREC_UNARY,
-               [EXPR_UNARY_DEREFERENCE]         = PREC_UNARY,
-               [EXPR_UNARY_TAKE_ADDRESS]        = PREC_UNARY,
-               [EXPR_UNARY_POSTFIX_INCREMENT]   = PREC_POSTFIX,
-               [EXPR_UNARY_POSTFIX_DECREMENT]   = PREC_POSTFIX,
-               [EXPR_UNARY_PREFIX_INCREMENT]    = PREC_UNARY,
-               [EXPR_UNARY_PREFIX_DECREMENT]    = PREC_UNARY,
-               [EXPR_UNARY_CAST]                = PREC_UNARY,
-               [EXPR_UNARY_CAST_IMPLICIT]       = PREC_UNARY,
-               [EXPR_UNARY_ASSUME]              = PREC_PRIMARY,
-               [EXPR_UNARY_DELETE]              = PREC_UNARY,
-               [EXPR_UNARY_DELETE_ARRAY]        = PREC_UNARY,
-               [EXPR_UNARY_THROW]               = PREC_ASSIGNMENT,
-
-               [EXPR_BINARY_ADD]                = PREC_ADDITIVE,
-               [EXPR_BINARY_SUB]                = PREC_ADDITIVE,
-               [EXPR_BINARY_MUL]                = PREC_MULTIPLICATIVE,
-               [EXPR_BINARY_DIV]                = PREC_MULTIPLICATIVE,
-               [EXPR_BINARY_MOD]                = PREC_MULTIPLICATIVE,
-               [EXPR_BINARY_EQUAL]              = PREC_EQUALITY,
-               [EXPR_BINARY_NOTEQUAL]           = PREC_EQUALITY,
-               [EXPR_BINARY_LESS]               = PREC_RELATIONAL,
-               [EXPR_BINARY_LESSEQUAL]          = PREC_RELATIONAL,
-               [EXPR_BINARY_GREATER]            = PREC_RELATIONAL,
-               [EXPR_BINARY_GREATEREQUAL]       = PREC_RELATIONAL,
-               [EXPR_BINARY_BITWISE_AND]        = PREC_AND,
-               [EXPR_BINARY_BITWISE_OR]         = PREC_OR,
-               [EXPR_BINARY_BITWISE_XOR]        = PREC_XOR,
-               [EXPR_BINARY_LOGICAL_AND]        = PREC_LOGICAL_AND,
-               [EXPR_BINARY_LOGICAL_OR]         = PREC_LOGICAL_OR,
-               [EXPR_BINARY_SHIFTLEFT]          = PREC_SHIFT,
-               [EXPR_BINARY_SHIFTRIGHT]         = PREC_SHIFT,
-               [EXPR_BINARY_ASSIGN]             = PREC_ASSIGNMENT,
-               [EXPR_BINARY_MUL_ASSIGN]         = PREC_ASSIGNMENT,
-               [EXPR_BINARY_DIV_ASSIGN]         = PREC_ASSIGNMENT,
-               [EXPR_BINARY_MOD_ASSIGN]         = PREC_ASSIGNMENT,
-               [EXPR_BINARY_ADD_ASSIGN]         = PREC_ASSIGNMENT,
-               [EXPR_BINARY_SUB_ASSIGN]         = PREC_ASSIGNMENT,
-               [EXPR_BINARY_SHIFTLEFT_ASSIGN]   = PREC_ASSIGNMENT,
-               [EXPR_BINARY_SHIFTRIGHT_ASSIGN]  = PREC_ASSIGNMENT,
-               [EXPR_BINARY_BITWISE_AND_ASSIGN] = PREC_ASSIGNMENT,
-               [EXPR_BINARY_BITWISE_XOR_ASSIGN] = PREC_ASSIGNMENT,
-               [EXPR_BINARY_BITWISE_OR_ASSIGN]  = PREC_ASSIGNMENT,
-               [EXPR_BINARY_COMMA]              = PREC_EXPRESSION,
-
-               [EXPR_BINARY_BUILTIN_EXPECT]     = PREC_PRIMARY,
-               [EXPR_BINARY_ISGREATER]          = PREC_PRIMARY,
-               [EXPR_BINARY_ISGREATEREQUAL]     = PREC_PRIMARY,
-               [EXPR_BINARY_ISLESS]             = PREC_PRIMARY,
-               [EXPR_BINARY_ISLESSEQUAL]        = PREC_PRIMARY,
-               [EXPR_BINARY_ISLESSGREATER]      = PREC_PRIMARY,
-               [EXPR_BINARY_ISUNORDERED]        = PREC_PRIMARY
+               [EXPR_UNKNOWN]                    = PREC_PRIMARY,
+               [EXPR_INVALID]                    = PREC_PRIMARY,
+               [EXPR_REFERENCE]                  = PREC_PRIMARY,
+               [EXPR_REFERENCE_ENUM_VALUE]       = PREC_PRIMARY,
+               [EXPR_CHARACTER_CONSTANT]         = PREC_PRIMARY,
+               [EXPR_WIDE_CHARACTER_CONSTANT]    = PREC_PRIMARY,
+               [EXPR_CONST]                      = PREC_PRIMARY,
+               [EXPR_STRING_LITERAL]             = PREC_PRIMARY,
+               [EXPR_WIDE_STRING_LITERAL]        = PREC_PRIMARY,
+               [EXPR_COMPOUND_LITERAL]           = PREC_UNARY,
+               [EXPR_CALL]                       = PREC_POSTFIX,
+               [EXPR_CONDITIONAL]                = PREC_CONDITIONAL,
+               [EXPR_SELECT]                     = PREC_POSTFIX,
+               [EXPR_ARRAY_ACCESS]               = PREC_POSTFIX,
+               [EXPR_SIZEOF]                     = PREC_UNARY,
+               [EXPR_CLASSIFY_TYPE]              = PREC_UNARY,
+               [EXPR_ALIGNOF]                    = PREC_UNARY,
+
+               [EXPR_FUNCNAME]                   = PREC_PRIMARY,
+               [EXPR_BUILTIN_SYMBOL]             = PREC_PRIMARY,
+               [EXPR_BUILTIN_CONSTANT_P]         = PREC_PRIMARY,
+               [EXPR_BUILTIN_TYPES_COMPATIBLE_P] = PREC_PRIMARY,
+               [EXPR_OFFSETOF]                   = PREC_PRIMARY,
+               [EXPR_VA_START]                   = PREC_PRIMARY,
+               [EXPR_VA_ARG]                     = PREC_PRIMARY,
+               [EXPR_STATEMENT]                  = PREC_PRIMARY,
+               [EXPR_LABEL_ADDRESS]              = PREC_PRIMARY,
+
+               [EXPR_UNARY_NEGATE]               = PREC_UNARY,
+               [EXPR_UNARY_PLUS]                 = PREC_UNARY,
+               [EXPR_UNARY_BITWISE_NEGATE]       = PREC_UNARY,
+               [EXPR_UNARY_NOT]                  = PREC_UNARY,
+               [EXPR_UNARY_DEREFERENCE]          = PREC_UNARY,
+               [EXPR_UNARY_TAKE_ADDRESS]         = PREC_UNARY,
+               [EXPR_UNARY_POSTFIX_INCREMENT]    = PREC_POSTFIX,
+               [EXPR_UNARY_POSTFIX_DECREMENT]    = PREC_POSTFIX,
+               [EXPR_UNARY_PREFIX_INCREMENT]     = PREC_UNARY,
+               [EXPR_UNARY_PREFIX_DECREMENT]     = PREC_UNARY,
+               [EXPR_UNARY_CAST]                 = PREC_UNARY,
+               [EXPR_UNARY_CAST_IMPLICIT]        = PREC_UNARY,
+               [EXPR_UNARY_ASSUME]               = PREC_PRIMARY,
+               [EXPR_UNARY_DELETE]               = PREC_UNARY,
+               [EXPR_UNARY_DELETE_ARRAY]         = PREC_UNARY,
+               [EXPR_UNARY_THROW]                = PREC_ASSIGNMENT,
+
+               [EXPR_BINARY_ADD]                 = PREC_ADDITIVE,
+               [EXPR_BINARY_SUB]                 = PREC_ADDITIVE,
+               [EXPR_BINARY_MUL]                 = PREC_MULTIPLICATIVE,
+               [EXPR_BINARY_DIV]                 = PREC_MULTIPLICATIVE,
+               [EXPR_BINARY_MOD]                 = PREC_MULTIPLICATIVE,
+               [EXPR_BINARY_EQUAL]               = PREC_EQUALITY,
+               [EXPR_BINARY_NOTEQUAL]            = PREC_EQUALITY,
+               [EXPR_BINARY_LESS]                = PREC_RELATIONAL,
+               [EXPR_BINARY_LESSEQUAL]           = PREC_RELATIONAL,
+               [EXPR_BINARY_GREATER]             = PREC_RELATIONAL,
+               [EXPR_BINARY_GREATEREQUAL]        = PREC_RELATIONAL,
+               [EXPR_BINARY_BITWISE_AND]         = PREC_AND,
+               [EXPR_BINARY_BITWISE_OR]          = PREC_OR,
+               [EXPR_BINARY_BITWISE_XOR]         = PREC_XOR,
+               [EXPR_BINARY_LOGICAL_AND]         = PREC_LOGICAL_AND,
+               [EXPR_BINARY_LOGICAL_OR]          = PREC_LOGICAL_OR,
+               [EXPR_BINARY_SHIFTLEFT]           = PREC_SHIFT,
+               [EXPR_BINARY_SHIFTRIGHT]          = PREC_SHIFT,
+               [EXPR_BINARY_ASSIGN]              = PREC_ASSIGNMENT,
+               [EXPR_BINARY_MUL_ASSIGN]          = PREC_ASSIGNMENT,
+               [EXPR_BINARY_DIV_ASSIGN]          = PREC_ASSIGNMENT,
+               [EXPR_BINARY_MOD_ASSIGN]          = PREC_ASSIGNMENT,
+               [EXPR_BINARY_ADD_ASSIGN]          = PREC_ASSIGNMENT,
+               [EXPR_BINARY_SUB_ASSIGN]          = PREC_ASSIGNMENT,
+               [EXPR_BINARY_SHIFTLEFT_ASSIGN]    = PREC_ASSIGNMENT,
+               [EXPR_BINARY_SHIFTRIGHT_ASSIGN]   = PREC_ASSIGNMENT,
+               [EXPR_BINARY_BITWISE_AND_ASSIGN]  = PREC_ASSIGNMENT,
+               [EXPR_BINARY_BITWISE_XOR_ASSIGN]  = PREC_ASSIGNMENT,
+               [EXPR_BINARY_BITWISE_OR_ASSIGN]   = PREC_ASSIGNMENT,
+               [EXPR_BINARY_COMMA]               = PREC_EXPRESSION,
+
+               [EXPR_BINARY_ISGREATER]           = PREC_PRIMARY,
+               [EXPR_BINARY_ISGREATEREQUAL]      = PREC_PRIMARY,
+               [EXPR_BINARY_ISLESS]              = PREC_PRIMARY,
+               [EXPR_BINARY_ISLESSEQUAL]         = PREC_PRIMARY,
+               [EXPR_BINARY_ISLESSGREATER]       = PREC_PRIMARY,
+               [EXPR_BINARY_ISUNORDERED]         = PREC_PRIMARY
        };
-       assert((unsigned)kind < (sizeof(prec)/sizeof(prec[0])));
+       assert((size_t)kind < lengthof(prec));
        unsigned res = prec[kind];
 
        assert(res != PREC_BOTTOM);
@@ -190,7 +192,7 @@ static unsigned get_expression_precedence(expression_kind_t kind)
  */
 static void print_const(const const_expression_t *cnst)
 {
-       if(cnst->base.type == NULL)
+       if (cnst->base.type == NULL)
                return;
 
        const type_t *const type = skip_typeref(cnst->base.type);
@@ -240,10 +242,11 @@ static void print_quoted_string(const string_t *const string, char border, int s
        fputc(border, out);
        const char *end = string->begin + string->size - skip;
        for (const char *c = string->begin; c != end; ++c) {
-               if (*c == border) {
+               unsigned char const tc = *c;
+               if (tc == border) {
                        fputc('\\', out);
                }
-               switch (*c) {
+               switch (tc) {
                case '\\':  fputs("\\\\", out); break;
                case '\a':  fputs("\\a", out); break;
                case '\b':  fputs("\\b", out); break;
@@ -257,13 +260,13 @@ static void print_quoted_string(const string_t *const string, char border, int s
                        if (c_mode & _GNUC) {
                                fputs("\\e", out); break;
                        }
-                       /*fallthrough*/
+                       /* FALLTHROUGH */
                default:
-                       if(!isprint(*c)) {
-                               fprintf(out, "\\%03o", (unsigned)*c);
-                               break;
+                       if (tc < 0x80 && !isprint(tc)) {
+                               fprintf(out, "\\%03o", (unsigned)tc);
+                       } else {
+                               fputc(tc, out);
                        }
-                       fputc(*c, out);
                        break;
                }
        }
@@ -299,14 +302,14 @@ static void print_quoted_wide_string(const wide_string_t *const wstr,
                                if (c_mode & _GNUC) {
                                        fputs("\\e", out); break;
                                }
-                               /*fallthrough*/
+                               /* FALLTHROUGH */
                        default: {
                                const unsigned tc = *c;
                                if (tc < 0x80U) {
-                                       if (!isprint(*c))  {
-                                               fprintf(out, "\\%03o", (char)*c);
-                                       } else {
+                                       if (isprint(*c)) {
                                                fputc(*c, out);
+                                       } else {
+                                               fprintf(out, "\\%03o", tc);
                                        }
                                } else if (tc < 0x800) {
                                        fputc(0xC0 | (tc >> 6),   out);
@@ -356,8 +359,7 @@ static void print_string_literal(
 /**
  * Prints a predefined symbol.
  */
-static void print_funcname(
-               const funcname_expression_t *funcname)
+static void print_funcname(const funcname_expression_t *funcname)
 {
        const char *s = "";
        switch (funcname->kind) {
@@ -366,9 +368,7 @@ static void print_funcname(
        case FUNCNAME_FUNCSIG:         s = "__FUNCSIG__"; break;
        case FUNCNAME_FUNCDNAME:       s = "__FUNCDNAME__"; break;
        }
-       fputc('"', out);
        fputs(s, out);
-       fputc('"', out);
 }
 
 static void print_wide_string_literal(
@@ -386,6 +386,11 @@ static void print_compound_literal(
        print_initializer(expression->initializer);
 }
 
+static void print_assignment_expression(const expression_t *const expr)
+{
+       print_expression_prec(expr, PREC_ASSIGNMENT);
+}
+
 /**
  * Prints a call expression.
  *
@@ -398,13 +403,13 @@ static void print_call_expression(const call_expression_t *call)
        fputc('(', out);
        call_argument_t *argument = call->arguments;
        int              first    = 1;
-       while(argument != NULL) {
-               if(!first) {
+       while (argument != NULL) {
+               if (!first) {
                        fputs(", ", out);
                } else {
                        first = 0;
                }
-               print_expression_prec(argument->expression, PREC_ASSIGNMENT);
+               print_assignment_expression(argument->expression);
 
                argument = argument->next;
        }
@@ -421,15 +426,6 @@ static void print_binary_expression(const binary_expression_t *binexpr)
        unsigned prec = get_expression_precedence(binexpr->base.kind);
        int      r2l  = right_to_left(prec);
 
-       if(binexpr->base.kind == EXPR_BINARY_BUILTIN_EXPECT) {
-               fputs("__builtin_expect(", out);
-               print_expression_prec(binexpr->left, prec);
-               fputs(", ", out);
-               print_expression_prec(binexpr->right, prec);
-               fputc(')', out);
-               return;
-       }
-
        print_expression_prec(binexpr->left, prec + r2l);
        char const* op;
        switch (binexpr->base.kind) {
@@ -506,7 +502,7 @@ static void print_unary_expression(const unary_expression_t *unexpr)
                break;
        case EXPR_UNARY_ASSUME:
                fputs("__assume(", out);
-               print_expression_prec(unexpr->value, PREC_ASSIGNMENT);
+               print_assignment_expression(unexpr->value);
                fputc(')', out);
                return;
 
@@ -552,7 +548,7 @@ static void print_label_address_expression(const label_address_expression_t *le)
 static void print_array_expression(const array_access_expression_t *expression)
 {
        unsigned prec = get_expression_precedence(expression->base.kind);
-       if(!expression->flipped) {
+       if (!expression->flipped) {
                print_expression_prec(expression->array_ref, prec);
                fputc('[', out);
                print_expression(expression->index);
@@ -578,11 +574,9 @@ static void print_typeprop_expression(const typeprop_expression_t *expression)
                assert(expression->base.kind == EXPR_ALIGNOF);
                fputs("__alignof__", out);
        }
-       if(expression->tp_expression != NULL) {
-               /* always print the '()' here, sizeof x is right but unusual */
-               fputc('(', out);
-               print_expression(expression->tp_expression);
-               fputc(')', out);
+       if (expression->tp_expression != NULL) {
+               /* PREC_TOP: always print the '()' here, sizeof x is right but unusual */
+               print_expression_prec(expression->tp_expression, PREC_TOP);
        } else {
                fputc('(', out);
                print_type(expression->type);
@@ -608,27 +602,22 @@ static void print_builtin_symbol(const builtin_symbol_expression_t *expression)
 static void print_builtin_constant(const builtin_constant_expression_t *expression)
 {
        fputs("__builtin_constant_p(", out);
-       print_expression_prec(expression->value, PREC_ASSIGNMENT);
+       print_assignment_expression(expression->value);
        fputc(')', out);
 }
 
 /**
- * Prints a builtin prefetch expression.
+ * Prints a builtin types compatible expression.
  *
- * @param expression   the builtin prefetch expression
+ * @param expression   the builtin types compatible expression
  */
-static void print_builtin_prefetch(const builtin_prefetch_expression_t *expression)
+static void print_builtin_types_compatible(
+               const builtin_types_compatible_expression_t *expression)
 {
-       fputs("__builtin_prefetch(", out);
-       print_expression_prec(expression->adr, PREC_ASSIGNMENT);
-       if (expression->rw) {
-               fputc(',', out);
-               print_expression_prec(expression->rw, PREC_ASSIGNMENT);
-       }
-       if (expression->locality) {
-               fputc(',', out);
-               print_expression_prec(expression->locality, PREC_ASSIGNMENT);
-       }
+       fputs("__builtin_types_compatible_p(", out);
+       print_type(expression->left);
+       fputs(", ", out);
+       print_type(expression->right);
        fputc(')', out);
 }
 
@@ -659,7 +648,7 @@ static void print_conditional(const conditional_expression_t *expression)
 static void print_va_start(const va_start_expression_t *const expression)
 {
        fputs("__builtin_va_start(", out);
-       print_expression_prec(expression->ap, PREC_ASSIGNMENT);
+       print_assignment_expression(expression->ap);
        fputs(", ", out);
        fputs(expression->parameter->base.base.symbol->string, out);
        fputc(')', out);
@@ -673,7 +662,7 @@ static void print_va_start(const va_start_expression_t *const expression)
 static void print_va_arg(const va_arg_expression_t *expression)
 {
        fputs("__builtin_va_arg(", out);
-       print_expression_prec(expression->ap, PREC_ASSIGNMENT);
+       print_assignment_expression(expression->ap);
        fputs(", ", out);
        print_type(expression->base.type);
        fputc(')', out);
@@ -688,7 +677,7 @@ static void print_select(const select_expression_t *expression)
 {
        unsigned prec = get_expression_precedence(expression->base.kind);
        print_expression_prec(expression->compound, prec);
-       if(is_type_pointer(skip_typeref(expression->compound->base.type))) {
+       if (is_type_pointer(skip_typeref(expression->compound->base.type))) {
                fputs("->", out);
        } else {
                fputc('.', out);
@@ -705,7 +694,7 @@ static void print_classify_type_expression(
        const classify_type_expression_t *const expr)
 {
        fputs("__builtin_classify_type(", out);
-       print_expression_prec(expr->type_expression, PREC_ASSIGNMENT);
+       print_assignment_expression(expr->type_expression);
        fputc(')', out);
 }
 
@@ -766,10 +755,13 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p
        if (expression->kind == EXPR_UNARY_CAST_IMPLICIT && !print_implicit_casts) {
                expression = expression->unary.value;
        }
-       unsigned prec = get_expression_precedence(expression->base.kind);
-       if (print_parenthesis && top_prec != PREC_BOTTOM)
-               top_prec = PREC_TOP;
-       if (top_prec > prec)
+
+       bool parenthesized =
+               expression->base.parenthesized                 ||
+               (print_parenthesis && top_prec != PREC_BOTTOM) ||
+               top_prec > get_expression_precedence(expression->base.kind);
+
+       if (parenthesized)
                fputc('(', out);
        switch (expression->kind) {
        case EXPR_UNKNOWN:
@@ -826,8 +818,8 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p
        case EXPR_BUILTIN_CONSTANT_P:
                print_builtin_constant(&expression->builtin_constant);
                break;
-       case EXPR_BUILTIN_PREFETCH:
-               print_builtin_prefetch(&expression->builtin_prefetch);
+       case EXPR_BUILTIN_TYPES_COMPATIBLE_P:
+               print_builtin_types_compatible(&expression->builtin_types_compatible);
                break;
        case EXPR_CONDITIONAL:
                print_conditional(&expression->conditional);
@@ -853,10 +845,10 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p
 
        default:
                /* TODO */
-               fprintf(out, "some expression of type %d", (int) expression->kind);
+               fprintf(out, "some expression of type %d", (int)expression->kind);
                break;
        }
-       if (top_prec > prec)
+       if (parenthesized)
                fputc(')', out);
 }
 
@@ -882,7 +874,7 @@ static void print_compound_statement(const compound_statement_t *block)
        }
        --indent;
        print_indent();
-       fputs("}\n", out);
+       fputs(block->stmt_expr ? "}" : "}\n", out);
 }
 
 /**
@@ -892,10 +884,14 @@ static void print_compound_statement(const compound_statement_t *block)
  */
 static void print_return_statement(const return_statement_t *statement)
 {
-       fputs("return ", out);
-       if(statement->value != NULL)
-               print_expression(statement->value);
-       fputs(";\n", out);
+       expression_t const *const val = statement->value;
+       if (val != NULL) {
+               fputs("return ", out);
+               print_expression(val);
+               fputs(";\n", out);
+       } else {
+               fputs("return;\n", out);
+       }
 }
 
 /**
@@ -950,7 +946,7 @@ static void print_if_statement(const if_statement_t *statement)
        fputs(") ", out);
        print_statement(statement->true_statement);
 
-       if(statement->false_statement != NULL) {
+       if (statement->false_statement != NULL) {
                print_indent();
                fputs("else ", out);
                print_statement(statement->false_statement);
@@ -977,7 +973,7 @@ static void print_switch_statement(const switch_statement_t *statement)
  */
 static void print_case_label(const case_label_statement_t *statement)
 {
-       if(statement->expression == NULL) {
+       if (statement->expression == NULL) {
                fputs("default:\n", out);
        } else {
                fputs("case ", out);
@@ -989,7 +985,7 @@ static void print_case_label(const case_label_statement_t *statement)
                fputs(":\n", out);
        }
        ++indent;
-       if(statement->statement != NULL) {
+       if (statement->statement != NULL) {
                if (statement->statement->base.kind == STATEMENT_CASE_LABEL) {
                        --indent;
                }
@@ -998,30 +994,11 @@ static void print_case_label(const case_label_statement_t *statement)
        }
 }
 
-static void print_local_label(const local_label_statement_t *statement)
-{
-       fputs("__label__ ", out);
-
-       bool      first  = true;
-       entity_t *entity = statement->labels_begin;
-       for (;
-               entity != statement->labels_end->base.next;
-               entity = entity->base.next) {
-               if (!first) {
-                       fputs(", ", out);
-               } else {
-                       first = false;
-               }
-               fputs(entity->base.symbol->string, out);
-       }
-       fputs(";\n", out);
-}
-
 static void print_typedef(const entity_t *entity)
 {
        fputs("typedef ", out);
        print_type_ext(entity->typedefe.type, entity->base.symbol, NULL);
-       fputs(";", out);
+       fputc(';', out);
 }
 
 /**
@@ -1049,10 +1026,14 @@ static void print_declaration_statement(
 {
        bool first = true;
        entity_t *entity = statement->declarations_begin;
-       for (;
-                entity != statement->declarations_end->base.next;
-                entity = entity->base.next) {
-               if (!is_declaration(entity) && entity->kind != ENTITY_TYPEDEF)
+       if (entity == NULL) {
+               fputs("/* empty declaration statement */\n", out);
+               return;
+       }
+
+       entity_t *const end = statement->declarations_end->base.next;
+       for (; entity != end; entity = entity->base.next) {
+               if (entity->kind == ENTITY_ENUM_VALUE)
                        continue;
                if (is_generated_entity(entity))
                        continue;
@@ -1063,13 +1044,7 @@ static void print_declaration_statement(
                        first = false;
                }
 
-               if (entity->kind == ENTITY_TYPEDEF) {
-                       print_typedef(entity);
-               } else {
-                       assert(is_declaration(entity));
-                       print_declaration(entity);
-               }
-
+               print_entity(entity);
                fputc('\n', out);
        }
 }
@@ -1110,29 +1085,25 @@ static void print_do_while_statement(const do_while_statement_t *statement)
 static void print_for_statement(const for_statement_t *statement)
 {
        fputs("for (", out);
-       entity_t *entity = statement->scope.entities;
-       while (entity != NULL && is_generated_entity(entity))
-               entity = entity->base.next;
-
-       if (entity != NULL) {
-               assert(statement->initialisation == NULL);
-               assert(is_declaration(entity));
-               print_declaration(entity);
-               if (entity->base.next != NULL) {
-                       panic("multiple declarations in for statement not supported yet");
-               }
-               fputc(' ', out);
+       if (statement->initialisation != NULL) {
+               print_expression(statement->initialisation);
+               fputc(';', out);
        } else {
-               if(statement->initialisation) {
-                       print_expression(statement->initialisation);
+               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);
                }
-               fputs("; ", out);
        }
-       if(statement->condition != NULL) {
+       if (statement->condition != NULL) {
+               fputc(' ', out);
                print_expression(statement->condition);
        }
-       fputs("; ", out);
-       if(statement->step != NULL) {
+       fputc(';', out);
+       if (statement->step != NULL) {
+               fputc(' ', out);
                print_expression(statement->step);
        }
        fputs(") ", out);
@@ -1147,11 +1118,11 @@ static void print_for_statement(const for_statement_t *statement)
 static void print_asm_arguments(asm_argument_t *arguments)
 {
        asm_argument_t *argument = arguments;
-       for; argument != NULL; argument = argument->next) {
-               if(argument != arguments)
+       for (; argument != NULL; argument = argument->next) {
+               if (argument != arguments)
                        fputs(", ", out);
 
-               if(argument->symbol) {
+               if (argument->symbol) {
                        fprintf(out, "[%s] ", argument->symbol->string);
                }
                print_quoted_string(&argument->constraints, '"', 1);
@@ -1169,8 +1140,8 @@ static void print_asm_arguments(asm_argument_t *arguments)
 static void print_asm_clobbers(asm_clobber_t *clobbers)
 {
        asm_clobber_t *clobber = clobbers;
-       for; clobber != NULL; clobber = clobber->next) {
-               if(clobber != clobbers)
+       for (; clobber != NULL; clobber = clobber->next) {
+               if (clobber != clobbers)
                        fputs(", ", out);
 
                print_quoted_string(&clobber->clobber, '"', 1);
@@ -1185,7 +1156,7 @@ static void print_asm_clobbers(asm_clobber_t *clobbers)
 static void print_asm_statement(const asm_statement_t *statement)
 {
        fputs("asm ", out);
-       if(statement->is_volatile) {
+       if (statement->is_volatile) {
                fputs("volatile ", out);
        }
        fputc('(', out);
@@ -1222,7 +1193,7 @@ static void print_ms_try_statement(const ms_try_statement_t *statement)
        fputs("__try ", out);
        print_statement(statement->try_statement);
        print_indent();
-       if(statement->except_expression != NULL) {
+       if (statement->except_expression != NULL) {
                fputs("__except(", out);
                print_expression(statement->except_expression);
                fputs(") ", out);
@@ -1239,7 +1210,7 @@ static void print_ms_try_statement(const ms_try_statement_t *statement)
  */
 static void print_leave_statement(const leave_statement_t *statement)
 {
-       (void) statement;
+       (void)statement;
        fputs("__leave;\n", out);
 }
 
@@ -1266,9 +1237,6 @@ void print_statement(const statement_t *statement)
        case STATEMENT_LABEL:
                print_label_statement(&statement->label);
                break;
-       case STATEMENT_LOCAL_LABEL:
-               print_local_label(&statement->local_label);
-               break;
        case STATEMENT_GOTO:
                print_goto_statement(&statement->gotos);
                break;
@@ -1321,16 +1289,15 @@ void print_statement(const statement_t *statement)
  */
 static void print_storage_class(storage_class_tag_t storage_class)
 {
-       const char *text;
        switch (storage_class) {
        case STORAGE_CLASS_NONE:     return;
-       case STORAGE_CLASS_TYPEDEF:  text = "typedef ";  break;
-       case STORAGE_CLASS_EXTERN:   text = "extern ";   break;
-       case STORAGE_CLASS_STATIC:   text = "static ";   break;
-       case STORAGE_CLASS_AUTO:     text = "auto ";     break;
-       case STORAGE_CLASS_REGISTER: text = "register "; break;
+       case STORAGE_CLASS_TYPEDEF:  fputs("typedef ",  out); return;
+       case STORAGE_CLASS_EXTERN:   fputs("extern ",   out); return;
+       case STORAGE_CLASS_STATIC:   fputs("static ",   out); return;
+       case STORAGE_CLASS_AUTO:     fputs("auto ",     out); return;
+       case STORAGE_CLASS_REGISTER: fputs("register ", out); return;
        }
-       fputs(text, out);
+       panic("invalid storage class");
 }
 
 /**
@@ -1340,7 +1307,7 @@ static void print_storage_class(storage_class_tag_t storage_class)
  */
 void print_initializer(const initializer_t *initializer)
 {
-       if(initializer == NULL) {
+       if (initializer == NULL) {
                fputs("{}", out);
                return;
        }
@@ -1348,7 +1315,7 @@ void print_initializer(const initializer_t *initializer)
        switch (initializer->kind) {
        case INITIALIZER_VALUE: {
                const initializer_value_t *value = &initializer->value;
-               print_expression(value->value);
+               print_assignment_expression(value->value);
                return;
        }
        case INITIALIZER_LIST: {
@@ -1356,11 +1323,11 @@ void print_initializer(const initializer_t *initializer)
                fputs("{ ", out);
                const initializer_list_t *list = &initializer->list;
 
-               for(size_t i = 0 ; i < list->len; ++i) {
+               for (size_t i = 0 ; i < list->len; ++i) {
                        const initializer_t *sub_init = list->initializers[i];
                        print_initializer(list->initializers[i]);
-                       if(i < list->len-1) {
-                               if(sub_init == NULL || sub_init->kind != INITIALIZER_DESIGNATOR)
+                       if (i < list->len-1) {
+                               if (sub_init == NULL || sub_init->kind != INITIALIZER_DESIGNATOR)
                                        fputs(", ", out);
                        }
                }
@@ -1387,7 +1354,7 @@ void print_initializer(const initializer_t *initializer)
  */
 static void print_ms_modifiers(const declaration_t *declaration)
 {
-       if((c_mode & _MS) == 0)
+       if ((c_mode & _MS) == 0)
                return;
 
        decl_modifiers_t modifiers = declaration->modifiers;
@@ -1396,7 +1363,7 @@ static void print_ms_modifiers(const declaration_t *declaration)
        const char *next     = "(";
 
        if (declaration->base.kind == ENTITY_VARIABLE) {
-               variable_t *variable = (variable_t*) declaration;
+               variable_t *variable = (variable_t*)declaration;
                if (variable->alignment != 0
                                || variable->get_property_sym != NULL
                                || variable->put_property_sym != NULL) {
@@ -1405,18 +1372,18 @@ static void print_ms_modifiers(const declaration_t *declaration)
                                ds_shown = true;
                        }
 
-                       if(variable->alignment != 0) {
+                       if (variable->alignment != 0) {
                                fputs(next, out); next = ", "; fprintf(out, "align(%u)", variable->alignment);
                        }
-                       if(variable->get_property_sym != NULL
+                       if (variable->get_property_sym != NULL
                                        || variable->put_property_sym != NULL) {
                                char *comma = "";
                                fputs(next, out); next = ", "; fputs("property(", out);
-                               if(variable->get_property_sym != NULL) {
+                               if (variable->get_property_sym != NULL) {
                                        fprintf(out, "get=%s", variable->get_property_sym->string);
                                        comma = ", ";
                                }
-                               if(variable->put_property_sym != NULL)
+                               if (variable->put_property_sym != NULL)
                                        fprintf(out, "%sput=%s", comma, variable->put_property_sym->string);
                                fputc(')', out);
                        }
@@ -1429,43 +1396,43 @@ static void print_ms_modifiers(const declaration_t *declaration)
                        fputs("__declspec", out);
                        ds_shown = true;
                }
-               if(modifiers & DM_DLLIMPORT) {
+               if (modifiers & DM_DLLIMPORT) {
                        fputs(next, out); next = ", "; fputs("dllimport", out);
                }
-               if(modifiers & DM_DLLEXPORT) {
+               if (modifiers & DM_DLLEXPORT) {
                        fputs(next, out); next = ", "; fputs("dllexport", out);
                }
-               if(modifiers & DM_THREAD) {
+               if (modifiers & DM_THREAD) {
                        fputs(next, out); next = ", "; fputs("thread", out);
                }
-               if(modifiers & DM_NAKED) {
+               if (modifiers & DM_NAKED) {
                        fputs(next, out); next = ", "; fputs("naked", out);
                }
-               if(modifiers & DM_THREAD) {
+               if (modifiers & DM_THREAD) {
                        fputs(next, out); next = ", "; fputs("thread", out);
                }
-               if(modifiers & DM_SELECTANY) {
+               if (modifiers & DM_SELECTANY) {
                        fputs(next, out); next = ", "; fputs("selectany", out);
                }
-               if(modifiers & DM_NOTHROW) {
+               if (modifiers & DM_NOTHROW) {
                        fputs(next, out); next = ", "; fputs("nothrow", out);
                }
-               if(modifiers & DM_NORETURN) {
+               if (modifiers & DM_NORETURN) {
                        fputs(next, out); next = ", "; fputs("noreturn", out);
                }
-               if(modifiers & DM_NOINLINE) {
+               if (modifiers & DM_NOINLINE) {
                        fputs(next, out); next = ", "; fputs("noinline", out);
                }
                if (modifiers & DM_DEPRECATED) {
                        fputs(next, out); next = ", "; fputs("deprecated", out);
-                       if(declaration->deprecated_string != NULL)
+                       if (declaration->deprecated_string != NULL)
                                fprintf(out, "(\"%s\")",
                                        declaration->deprecated_string);
                }
-               if(modifiers & DM_RESTRICT) {
+               if (modifiers & DM_RESTRICT) {
                        fputs(next, out); next = ", "; fputs("restrict", out);
                }
-               if(modifiers & DM_NOALIAS) {
+               if (modifiers & DM_NOALIAS) {
                        fputs(next, out); next = ", "; fputs("noalias", out);
                }
        }
@@ -1510,9 +1477,9 @@ void print_declaration(const entity_t *entity)
        assert(is_declaration(entity));
        const declaration_t *declaration = &entity->declaration;
 
-       print_storage_class((storage_class_tag_t) declaration->declared_storage_class);
+       print_storage_class((storage_class_tag_t)declaration->declared_storage_class);
        if (entity->kind == ENTITY_FUNCTION) {
-               function_t *function = (function_t*) declaration;
+               function_t *function = (function_t*)declaration;
                if (function->is_inline) {
                        if (declaration->modifiers & DM_FORCEINLINE) {
                                fputs("__forceinline ", out);
@@ -1574,11 +1541,10 @@ void print_entity(const entity_t *entity)
        if (entity->base.namespc != NAMESPACE_NORMAL && entity->base.symbol == NULL)
                return;
 
-       switch ((entity_kind_tag_t) entity->kind) {
+       switch ((entity_kind_tag_t)entity->kind) {
        case ENTITY_VARIABLE:
+       case ENTITY_PARAMETER:
        case ENTITY_COMPOUND_MEMBER:
-               print_declaration(entity);
-               return;
        case ENTITY_FUNCTION:
                print_declaration(entity);
                return;
@@ -1613,9 +1579,11 @@ void print_entity(const entity_t *entity)
        case ENTITY_NAMESPACE:
                print_namespace(&entity->namespacee);
                return;
+       case ENTITY_LOCAL_LABEL:
+               fprintf(out, "__label__ %s;", entity->base.symbol->string);
+               return;
        case ENTITY_LABEL:
        case ENTITY_ENUM_VALUE:
-       case ENTITY_LOCAL_LABEL:
                panic("print_entity used on unexpected entity type");
        case ENTITY_INVALID:
                break;
@@ -1660,9 +1628,9 @@ bool is_constant_initializer(const initializer_t *initializer)
                return is_constant_expression(initializer->value.value);
 
        case INITIALIZER_LIST:
-               for(size_t i = 0; i < initializer->list.len; ++i) {
+               for (size_t i = 0; i < initializer->list.len; ++i) {
                        initializer_t *sub_initializer = initializer->list.initializers[i];
-                       if(!is_constant_initializer(sub_initializer))
+                       if (!is_constant_initializer(sub_initializer))
                                return false;
                }
                return true;
@@ -1678,7 +1646,7 @@ static bool is_object_with_linker_constant_address(const expression_t *expressio
 
        case EXPR_SELECT: {
                type_t *base_type = skip_typeref(expression->select.compound->base.type);
-               if(is_type_pointer(base_type)) {
+               if (is_type_pointer(base_type)) {
                        /* it's a -> */
                        return is_address_constant(expression->select.compound);
                } else {
@@ -1693,7 +1661,7 @@ static bool is_object_with_linker_constant_address(const expression_t *expressio
        case EXPR_REFERENCE: {
                entity_t *entity = expression->reference.entity;
                if (is_declaration(entity)) {
-                       switch ((storage_class_tag_t) entity->declaration.storage_class) {
+                       switch ((storage_class_tag_t)entity->declaration.storage_class) {
                        case STORAGE_CLASS_NONE:
                        case STORAGE_CLASS_EXTERN:
                        case STORAGE_CLASS_STATIC:
@@ -1725,11 +1693,10 @@ bool is_address_constant(const expression_t *expression)
                type_t *real_type
                        = revert_automatic_type_conversion(expression->unary.value);
                /* dereferencing a function is a NOP */
-               if(is_type_function(real_type)) {
+               if (is_type_function(real_type)) {
                        return is_address_constant(expression->unary.value);
                }
-
-               /* fallthrough */
+               /* FALLTHROUGH */
        }
 
        case EXPR_UNARY_CAST: {
@@ -1737,8 +1704,8 @@ bool is_address_constant(const expression_t *expression)
                if (!is_type_pointer(dest) && (
                        dest->kind != TYPE_ATOMIC                                               ||
                        !(get_atomic_type_flags(dest->atomic.akind) & ATOMIC_TYPE_FLAG_INTEGER) ||
-                       (get_atomic_type_size(dest->atomic.akind) < get_atomic_type_size(get_intptr_kind())
-                   )))
+                       get_atomic_type_size(dest->atomic.akind) < get_atomic_type_size(get_intptr_kind())
+                   ))
                        return false;
 
                return (is_constant_expression(expression->unary.value)
@@ -1750,9 +1717,9 @@ bool is_address_constant(const expression_t *expression)
                expression_t *left  = expression->binary.left;
                expression_t *right = expression->binary.right;
 
-               if(is_type_pointer(skip_typeref(left->base.type))) {
+               if (is_type_pointer(skip_typeref(left->base.type))) {
                        return is_address_constant(left) && is_constant_expression(right);
-               } else if(is_type_pointer(skip_typeref(right->base.type))) {
+               } else if (is_type_pointer(skip_typeref(right->base.type))) {
                        return is_constant_expression(left)     && is_address_constant(right);
                }
 
@@ -1765,9 +1732,9 @@ bool is_address_constant(const expression_t *expression)
                        return false;
 
                type_t *type = skip_typeref(entity->declaration.type);
-               if(is_type_function(type))
+               if (is_type_function(type))
                        return true;
-               if(is_type_array(type)) {
+               if (is_type_array(type)) {
                        return is_object_with_linker_constant_address(expression);
                }
                /* Prevent stray errors */
@@ -1833,7 +1800,7 @@ static bool is_object_with_constant_address(const expression_t *expression)
                expression_t *compound      = expression->select.compound;
                type_t       *compound_type = compound->base.type;
                compound_type = skip_typeref(compound_type);
-               if(is_type_pointer(compound_type)) {
+               if (is_type_pointer(compound_type)) {
                        return is_constant_pointer(compound);
                } else {
                        return is_object_with_constant_address(compound);
@@ -1871,6 +1838,7 @@ bool is_constant_expression(const expression_t *expression)
        case EXPR_OFFSETOF:
        case EXPR_ALIGNOF:
        case EXPR_BUILTIN_CONSTANT_P:
+       case EXPR_BUILTIN_TYPES_COMPATIBLE_P:
        case EXPR_LABEL_ADDRESS:
        case EXPR_REFERENCE_ENUM_VALUE:
                return true;
@@ -1887,7 +1855,6 @@ bool is_constant_expression(const expression_t *expression)
        }
 
        case EXPR_BUILTIN_SYMBOL:
-       case EXPR_BUILTIN_PREFETCH:
        case EXPR_SELECT:
        case EXPR_VA_START:
        case EXPR_VA_ARG:
@@ -1948,11 +1915,8 @@ bool is_constant_expression(const expression_t *expression)
        case EXPR_BINARY_BITWISE_AND:
        case EXPR_BINARY_BITWISE_OR:
        case EXPR_BINARY_BITWISE_XOR:
-       case EXPR_BINARY_LOGICAL_AND:
-       case EXPR_BINARY_LOGICAL_OR:
        case EXPR_BINARY_SHIFTLEFT:
        case EXPR_BINARY_SHIFTRIGHT:
-       case EXPR_BINARY_BUILTIN_EXPECT:
        case EXPR_BINARY_ISGREATER:
        case EXPR_BINARY_ISGREATEREQUAL:
        case EXPR_BINARY_ISLESS:
@@ -1962,19 +1926,39 @@ bool is_constant_expression(const expression_t *expression)
                return is_constant_expression(expression->binary.left)
                        && is_constant_expression(expression->binary.right);
 
+       case EXPR_BINARY_LOGICAL_AND: {
+               expression_t const *const left = expression->binary.left;
+               if (!is_constant_expression(left))
+                       return false;
+               if (fold_constant(left) == 0)
+                       return true;
+               return is_constant_expression(expression->binary.right);
+       }
+
+       case EXPR_BINARY_LOGICAL_OR: {
+               expression_t const *const left = expression->binary.left;
+               if (!is_constant_expression(left))
+                       return false;
+               if (fold_constant(left) != 0)
+                       return true;
+               return is_constant_expression(expression->binary.right);
+       }
+
        case EXPR_COMPOUND_LITERAL:
                return is_constant_initializer(expression->compound_literal.initializer);
 
        case EXPR_CONDITIONAL: {
                expression_t *condition = expression->conditional.condition;
-               if(!is_constant_expression(condition))
+               if (!is_constant_expression(condition))
                        return false;
 
                long val = fold_constant(condition);
-               if(val != 0)
-                       return is_constant_expression(expression->conditional.true_expression);
-               else
+               if (val != 0) {
+                       expression_t const *const t = expression->conditional.true_expression;
+                       return t == NULL || is_constant_expression(t);
+               } else {
                        return is_constant_expression(expression->conditional.false_expression);
+               }
        }
 
        case EXPR_INVALID: