Implement -Wparentheses.
[cparser] / ast.c
diff --git a/ast.c b/ast.c
index b3ef16c..498393c 100644 (file)
--- a/ast.c
+++ b/ast.c
 #include "type_t.h"
 #include "parser.h"
 #include "lang_features.h"
+#include "entity_t.h"
 
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 
+#ifdef __INTEL_COMPILER
+#include <mathimf.h>
+#else
+#include <math.h>
+#endif
+
 #include "adt/error.h"
 
 struct obstack ast_obstack;
@@ -54,40 +61,27 @@ void change_indent(int delta)
 
 void print_indent(void)
 {
-       for(int i = 0; i < indent; ++i)
-               fprintf(out, "\t");
-}
-
-enum precedence_t {
-       PREC_BOTTOM  =  0,
-       PREC_COMMA   =  2, /* ,                                    left to right */
-       PREC_ASSIGN  =  4, /* = += -= *= /= %= <<= >>= &= ^= |=    right to left */
-       PREC_COND    =  6, /* ?:                                   right to left */
-       PREC_LOG_OR  =  8, /* ||                                   left to right */
-       PREC_LOG_AND = 10, /* &&                                   left to right */
-       PREC_BIT_OR  = 12, /* |                                    left to right */
-       PREC_BIT_XOR = 14, /* ^                                    left to right */
-       PREC_BIT_AND = 16, /* &                                    left to right */
-       PREC_EQ      = 18, /* == !=                                left to right */
-       PREC_CMP     = 20, /* < <= > >=                            left to right */
-       PREC_SHF     = 22, /* << >>                                left to right */
-       PREC_PLUS    = 24, /* + -                                  left to right */
-       PREC_MUL     = 26, /* * / %                                left to right */
-       PREC_UNARY   = 28, /* ! ~ ++ -- + - (type) * & sizeof      right to left */
-       PREC_ACCESS  = 30, /* () [] -> .                           left to right */
-       PREC_PRIM    = 32, /* primary */
-       PREC_TOP     = 34
-};
+       for (int i = 0; i < indent; ++i)
+               fputc('\t', out);
+}
 
 /**
  * Returns 1 if a given precedence level has right-to-left
- * associativity, else -1.
+ * associativity, else 0.
  *
  * @param precedence   the operator precedence
  */
-static int right_to_left(unsigned precedence) {
-       return (precedence == PREC_ASSIGN || precedence == PREC_COND ||
-               precedence == PREC_UNARY) ? 1 : -1;
+static int right_to_left(unsigned precedence)
+{
+       switch (precedence) {
+               case PREC_ASSIGNMENT:
+               case PREC_CONDITIONAL:
+               case PREC_UNARY:
+                       return 1;
+
+               default:
+                       return 0;
+       }
 }
 
 /**
@@ -98,31 +92,33 @@ static int right_to_left(unsigned precedence) {
 static unsigned get_expression_precedence(expression_kind_t kind)
 {
        static const unsigned prec[] = {
-               [EXPR_UNKNOWN]                   = PREC_PRIM,
-               [EXPR_INVALID]                   = PREC_PRIM,
-               [EXPR_REFERENCE]                 = PREC_PRIM,
-               [EXPR_CHARACTER_CONSTANT]        = PREC_PRIM,
-               [EXPR_WIDE_CHARACTER_CONSTANT]   = PREC_PRIM,
-               [EXPR_CONST]                     = PREC_PRIM,
-               [EXPR_STRING_LITERAL]            = PREC_PRIM,
-               [EXPR_WIDE_STRING_LITERAL]       = PREC_PRIM,
+               [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_PRIM,
-               [EXPR_CONDITIONAL]               = PREC_COND,
-               [EXPR_SELECT]                    = PREC_ACCESS,
-               [EXPR_ARRAY_ACCESS]              = PREC_ACCESS,
+               [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_PRIM,
-               [EXPR_BUILTIN_SYMBOL]            = PREC_PRIM,
-               [EXPR_BUILTIN_CONSTANT_P]        = PREC_PRIM,
-               [EXPR_BUILTIN_PREFETCH]          = PREC_PRIM,
-               [EXPR_OFFSETOF]                  = PREC_PRIM,
-               [EXPR_VA_START]                  = PREC_PRIM,
-               [EXPR_VA_ARG]                    = PREC_PRIM,
-               [EXPR_STATEMENT]                 = PREC_ACCESS,
+               [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,
@@ -130,52 +126,54 @@ static unsigned get_expression_precedence(expression_kind_t kind)
                [EXPR_UNARY_NOT]                 = PREC_UNARY,
                [EXPR_UNARY_DEREFERENCE]         = PREC_UNARY,
                [EXPR_UNARY_TAKE_ADDRESS]        = PREC_UNARY,
-               [EXPR_UNARY_POSTFIX_INCREMENT]   = PREC_UNARY,
-               [EXPR_UNARY_POSTFIX_DECREMENT]   = 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_PRIM,
-
-               [EXPR_BINARY_ADD]                = PREC_PLUS,
-               [EXPR_BINARY_SUB]                = PREC_PLUS,
-               [EXPR_BINARY_MUL]                = PREC_MUL,
-               [EXPR_BINARY_DIV]                = PREC_MUL,
-               [EXPR_BINARY_MOD]                = PREC_MUL,
-               [EXPR_BINARY_EQUAL]              = PREC_EQ,
-               [EXPR_BINARY_NOTEQUAL]           = PREC_EQ,
-               [EXPR_BINARY_LESS]               = PREC_CMP,
-               [EXPR_BINARY_LESSEQUAL]          = PREC_CMP,
-               [EXPR_BINARY_GREATER]            = PREC_CMP,
-               [EXPR_BINARY_GREATEREQUAL]       = PREC_CMP,
-               [EXPR_BINARY_BITWISE_AND]        = PREC_BIT_AND,
-               [EXPR_BINARY_BITWISE_OR]         = PREC_BIT_OR,
-               [EXPR_BINARY_BITWISE_XOR]        = PREC_BIT_XOR,
-               [EXPR_BINARY_LOGICAL_AND]        = PREC_LOG_AND,
-               [EXPR_BINARY_LOGICAL_OR]         = PREC_LOG_OR,
-               [EXPR_BINARY_SHIFTLEFT]          = PREC_SHF,
-               [EXPR_BINARY_SHIFTRIGHT]         = PREC_SHF,
-               [EXPR_BINARY_ASSIGN]             = PREC_ASSIGN,
-               [EXPR_BINARY_MUL_ASSIGN]         = PREC_ASSIGN,
-               [EXPR_BINARY_DIV_ASSIGN]         = PREC_ASSIGN,
-               [EXPR_BINARY_MOD_ASSIGN]         = PREC_ASSIGN,
-               [EXPR_BINARY_ADD_ASSIGN]         = PREC_ASSIGN,
-               [EXPR_BINARY_SUB_ASSIGN]         = PREC_ASSIGN,
-               [EXPR_BINARY_SHIFTLEFT_ASSIGN]   = PREC_ASSIGN,
-               [EXPR_BINARY_SHIFTRIGHT_ASSIGN]  = PREC_ASSIGN,
-               [EXPR_BINARY_BITWISE_AND_ASSIGN] = PREC_ASSIGN,
-               [EXPR_BINARY_BITWISE_XOR_ASSIGN] = PREC_ASSIGN,
-               [EXPR_BINARY_BITWISE_OR_ASSIGN]  = PREC_ASSIGN,
-               [EXPR_BINARY_COMMA]              = PREC_COMMA,
-
-               [EXPR_BINARY_BUILTIN_EXPECT]     = PREC_PRIM,
-               [EXPR_BINARY_ISGREATER]          = PREC_PRIM,
-               [EXPR_BINARY_ISGREATEREQUAL]     = PREC_PRIM,
-               [EXPR_BINARY_ISLESS]             = PREC_PRIM,
-               [EXPR_BINARY_ISLESSEQUAL]        = PREC_PRIM,
-               [EXPR_BINARY_ISLESSGREATER]      = PREC_PRIM,
-               [EXPR_BINARY_ISUNORDERED]        = PREC_PRIM
+               [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])));
        unsigned res = prec[kind];
@@ -191,18 +189,42 @@ 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);
 
-       if (is_type_integer(type)) {
+       if (is_type_atomic(type, ATOMIC_TYPE_BOOL)) {
+               fputs(cnst->v.int_value ? "true" : "false", out);
+       } else if (is_type_integer(type)) {
                fprintf(out, "%lld", cnst->v.int_value);
        } else if (is_type_float(type)) {
-               fprintf(out, "%Lf", cnst->v.float_value);
+               long double const val = cnst->v.float_value;
+#ifdef _WIN32
+               /* ARG, no way to print long double */
+               fprintf(out, "%.20g", (double)val);
+#else
+               fprintf(out, "%.20Lg", val);
+#endif
+               if (isfinite(val) && truncl(val) == val)
+                       fputs(".0", out);
        } else {
                panic("unknown constant");
        }
+
+       char const* suffix;
+       switch (type->atomic.akind) {
+               case ATOMIC_TYPE_UINT:        suffix = "U";   break;
+               case ATOMIC_TYPE_LONG:        suffix = "L";   break;
+               case ATOMIC_TYPE_ULONG:       suffix = "UL";  break;
+               case ATOMIC_TYPE_LONGLONG:    suffix = "LL";  break;
+               case ATOMIC_TYPE_ULONGLONG:   suffix = "ULL"; break;
+               case ATOMIC_TYPE_FLOAT:       suffix = "F";   break;
+               case ATOMIC_TYPE_LONG_DOUBLE: suffix = "L";   break;
+
+               default: return;
+       }
+       fputs(suffix, out);
 }
 
 /**
@@ -210,16 +232,17 @@ static void print_const(const const_expression_t *cnst)
  *
  * @param string  the string constant
  * @param border  the border char
+ * @param skip    number of chars to skip at the end
  */
-static void print_quoted_string(const string_t *const string, char border)
+static void print_quoted_string(const string_t *const string, char border, int skip)
 {
        fputc(border, out);
-       const char *end = string->begin + string->size - 1;
+       const char *end = string->begin + string->size - skip;
        for (const char *c = string->begin; c != end; ++c) {
                if (*c == border) {
                        fputc('\\', out);
                }
-               switch(*c) {
+               switch (*c) {
                case '\\':  fputs("\\\\", out); break;
                case '\a':  fputs("\\a", out); break;
                case '\b':  fputs("\\b", out); break;
@@ -229,9 +252,14 @@ static void print_quoted_string(const string_t *const string, char border)
                case '\t':  fputs("\\t", out); break;
                case '\v':  fputs("\\v", out); break;
                case '\?':  fputs("\\?", out); break;
+               case 27:
+                       if (c_mode & _GNUC) {
+                               fputs("\\e", out); break;
+                       }
+                       /* FALLTHROUGH */
                default:
-                       if(!isprint(*c)) {
-                               fprintf(out, "\\%03o", *c);
+                       if (!isprint(*c)) {
+                               fprintf(out, "\\%03o", (unsigned)*c);
                                break;
                        }
                        fputc(*c, out);
@@ -244,15 +272,17 @@ static void print_quoted_string(const string_t *const string, char border)
 /**
  * Prints a wide string literal expression.
  *
- * @param wstr  the wide string literal expression
+ * @param wstr    the wide string literal expression
+ * @param border  the border char
+ * @param skip    number of chars to skip at the end
  */
 static void print_quoted_wide_string(const wide_string_t *const wstr,
-                                     char border)
+                                     char border, int skip)
 {
        fputc('L', out);
        fputc(border, out);
-       for (const wchar_rep_t *c = wstr->begin, *end = wstr->begin + wstr->size-1;
-            c != end; ++c) {
+       const wchar_rep_t *end = wstr->begin + wstr->size - skip;
+       for (const wchar_rep_t *c = wstr->begin; c != end; ++c) {
                switch (*c) {
                        case L'\"':  fputs("\\\"", out); break;
                        case L'\\':  fputs("\\\\", out); break;
@@ -264,10 +294,15 @@ static void print_quoted_wide_string(const wide_string_t *const wstr,
                        case L'\t':  fputs("\\t",  out); break;
                        case L'\v':  fputs("\\v",  out); break;
                        case L'\?':  fputs("\\?",  out); break;
+                       case 27:
+                               if (c_mode & _GNUC) {
+                                       fputs("\\e", out); break;
+                               }
+                               /* FALLTHROUGH */
                        default: {
                                const unsigned tc = *c;
                                if (tc < 0x80U) {
-                                       if (!isprint(*c))  {
+                                       if (!isprint(*c)) {
                                                fprintf(out, "\\%03o", (char)*c);
                                        } else {
                                                fputc(*c, out);
@@ -298,12 +333,12 @@ static void print_quoted_wide_string(const wide_string_t *const wstr,
  */
 static void print_character_constant(const const_expression_t *cnst)
 {
-       print_quoted_string(&cnst->v.character, '\'');
+       print_quoted_string(&cnst->v.character, '\'', 0);
 }
 
 static void print_wide_character_constant(const const_expression_t *cnst)
 {
-       print_quoted_wide_string(&cnst->v.wide_character, '\'');
+       print_quoted_wide_string(&cnst->v.wide_character, '\'', 0);
 }
 
 /**
@@ -314,31 +349,28 @@ static void print_wide_character_constant(const const_expression_t *cnst)
 static void print_string_literal(
                const string_literal_expression_t *string_literal)
 {
-       print_quoted_string(&string_literal->value, '"');
+       print_quoted_string(&string_literal->value, '"', 1);
 }
 
 /**
  * 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) {
+       switch (funcname->kind) {
        case FUNCNAME_FUNCTION:        s = (c_mode & _C99) ? "__func__" : "__FUNCTION__"; break;
        case FUNCNAME_PRETTY_FUNCTION: s = "__PRETTY_FUNCTION__"; break;
        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(
        const wide_string_literal_expression_t *const wstr)
 {
-       print_quoted_wide_string(&wstr->value, '"');
+       print_quoted_wide_string(&wstr->value, '"', 1);
 }
 
 static void print_compound_literal(
@@ -346,10 +378,15 @@ static void print_compound_literal(
 {
        fputc('(', out);
        print_type(expression->type);
-       fputs(") ", out);
+       fputc(')', out);
        print_initializer(expression->initializer);
 }
 
+static void print_assignment_expression(const expression_t *const expr)
+{
+       print_expression_prec(expr, PREC_ASSIGNMENT);
+}
+
 /**
  * Prints a call expression.
  *
@@ -359,20 +396,20 @@ static void print_call_expression(const call_expression_t *call)
 {
        unsigned prec = get_expression_precedence(call->base.kind);
        print_expression_prec(call->function, prec);
-       fprintf(out, "(");
+       fputc('(', out);
        call_argument_t *argument = call->arguments;
        int              first    = 1;
-       while(argument != NULL) {
-               if(!first) {
-                       fprintf(out, ", ");
+       while (argument != NULL) {
+               if (!first) {
+                       fputs(", ", out);
                } else {
                        first = 0;
                }
-               print_expression_prec(argument->expression, PREC_COMMA + 1);
+               print_assignment_expression(argument->expression);
 
                argument = argument->next;
        }
-       fprintf(out, ")");
+       fputc(')', out);
 }
 
 /**
@@ -385,55 +422,44 @@ 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);
-       if (binexpr->base.kind != EXPR_BINARY_COMMA) {
-               fputc(' ', out);
-       }
+       char const* op;
        switch (binexpr->base.kind) {
-       case EXPR_BINARY_COMMA:              fputs(",", out);     break;
-       case EXPR_BINARY_ASSIGN:             fputs("=", out);     break;
-       case EXPR_BINARY_ADD:                fputs("+", out);     break;
-       case EXPR_BINARY_SUB:                fputs("-", out);     break;
-       case EXPR_BINARY_MUL:                fputs("*", out);     break;
-       case EXPR_BINARY_MOD:                fputs("%", out);     break;
-       case EXPR_BINARY_DIV:                fputs("/", out);     break;
-       case EXPR_BINARY_BITWISE_OR:         fputs("|", out);     break;
-       case EXPR_BINARY_BITWISE_AND:        fputs("&", out);     break;
-       case EXPR_BINARY_BITWISE_XOR:        fputs("^", out);     break;
-       case EXPR_BINARY_LOGICAL_OR:         fputs("||", out);    break;
-       case EXPR_BINARY_LOGICAL_AND:        fputs("&&", out);    break;
-       case EXPR_BINARY_NOTEQUAL:           fputs("!=", out);    break;
-       case EXPR_BINARY_EQUAL:              fputs("==", out);    break;
-       case EXPR_BINARY_LESS:               fputs("<", out);     break;
-       case EXPR_BINARY_LESSEQUAL:          fputs("<=", out);    break;
-       case EXPR_BINARY_GREATER:            fputs(">", out);     break;
-       case EXPR_BINARY_GREATEREQUAL:       fputs(">=", out);    break;
-       case EXPR_BINARY_SHIFTLEFT:          fputs("<<", out);    break;
-       case EXPR_BINARY_SHIFTRIGHT:         fputs(">>", out);    break;
-
-       case EXPR_BINARY_ADD_ASSIGN:         fputs("+=", out);    break;
-       case EXPR_BINARY_SUB_ASSIGN:         fputs("-=", out);    break;
-       case EXPR_BINARY_MUL_ASSIGN:         fputs("*=", out);    break;
-       case EXPR_BINARY_MOD_ASSIGN:         fputs("%=", out);    break;
-       case EXPR_BINARY_DIV_ASSIGN:         fputs("/=", out);    break;
-       case EXPR_BINARY_BITWISE_OR_ASSIGN:  fputs("|=", out);    break;
-       case EXPR_BINARY_BITWISE_AND_ASSIGN: fputs("&=", out);    break;
-       case EXPR_BINARY_BITWISE_XOR_ASSIGN: fputs("^=", out);    break;
-       case EXPR_BINARY_SHIFTLEFT_ASSIGN:   fputs("<<=", out);   break;
-       case EXPR_BINARY_SHIFTRIGHT_ASSIGN:  fputs(">>=", out);   break;
+       case EXPR_BINARY_COMMA:              op = ", ";    break;
+       case EXPR_BINARY_ASSIGN:             op = " = ";   break;
+       case EXPR_BINARY_ADD:                op = " + ";   break;
+       case EXPR_BINARY_SUB:                op = " - ";   break;
+       case EXPR_BINARY_MUL:                op = " * ";   break;
+       case EXPR_BINARY_MOD:                op = " % ";   break;
+       case EXPR_BINARY_DIV:                op = " / ";   break;
+       case EXPR_BINARY_BITWISE_OR:         op = " | ";   break;
+       case EXPR_BINARY_BITWISE_AND:        op = " & ";   break;
+       case EXPR_BINARY_BITWISE_XOR:        op = " ^ ";   break;
+       case EXPR_BINARY_LOGICAL_OR:         op = " || ";  break;
+       case EXPR_BINARY_LOGICAL_AND:        op = " && ";  break;
+       case EXPR_BINARY_NOTEQUAL:           op = " != ";  break;
+       case EXPR_BINARY_EQUAL:              op = " == ";  break;
+       case EXPR_BINARY_LESS:               op = " < ";   break;
+       case EXPR_BINARY_LESSEQUAL:          op = " <= ";  break;
+       case EXPR_BINARY_GREATER:            op = " > ";   break;
+       case EXPR_BINARY_GREATEREQUAL:       op = " >= ";  break;
+       case EXPR_BINARY_SHIFTLEFT:          op = " << ";  break;
+       case EXPR_BINARY_SHIFTRIGHT:         op = " >> ";  break;
+
+       case EXPR_BINARY_ADD_ASSIGN:         op = " += ";  break;
+       case EXPR_BINARY_SUB_ASSIGN:         op = " -= ";  break;
+       case EXPR_BINARY_MUL_ASSIGN:         op = " *= ";  break;
+       case EXPR_BINARY_MOD_ASSIGN:         op = " %= ";  break;
+       case EXPR_BINARY_DIV_ASSIGN:         op = " /= ";  break;
+       case EXPR_BINARY_BITWISE_OR_ASSIGN:  op = " |= ";  break;
+       case EXPR_BINARY_BITWISE_AND_ASSIGN: op = " &= ";  break;
+       case EXPR_BINARY_BITWISE_XOR_ASSIGN: op = " ^= ";  break;
+       case EXPR_BINARY_SHIFTLEFT_ASSIGN:   op = " <<= "; break;
+       case EXPR_BINARY_SHIFTRIGHT_ASSIGN:  op = " >>= "; break;
        default: panic("invalid binexpression found");
        }
-       fputc(' ', out);
-       print_expression_prec(binexpr->right, prec - r2l);
+       fputs(op, out);
+       print_expression_prec(binexpr->right, prec + 1 - r2l);
 }
 
 /**
@@ -444,15 +470,17 @@ static void print_binary_expression(const binary_expression_t *binexpr)
 static void print_unary_expression(const unary_expression_t *unexpr)
 {
        unsigned prec = get_expression_precedence(unexpr->base.kind);
-       switch(unexpr->base.kind) {
-       case EXPR_UNARY_NEGATE:           fputs("-", out);  break;
-       case EXPR_UNARY_PLUS:             fputs("+", out);  break;
-       case EXPR_UNARY_NOT:              fputs("!", out);  break;
-       case EXPR_UNARY_BITWISE_NEGATE:   fputs("~", out);  break;
-       case EXPR_UNARY_PREFIX_INCREMENT: fputs("++", out); break;
-       case EXPR_UNARY_PREFIX_DECREMENT: fputs("--", out); break;
-       case EXPR_UNARY_DEREFERENCE:      fputs("*", out);  break;
-       case EXPR_UNARY_TAKE_ADDRESS:     fputs("&", out);  break;
+       switch (unexpr->base.kind) {
+       case EXPR_UNARY_NEGATE:           fputc('-',          out); break;
+       case EXPR_UNARY_PLUS:             fputc('+',          out); break;
+       case EXPR_UNARY_NOT:              fputc('!',          out); break;
+       case EXPR_UNARY_BITWISE_NEGATE:   fputc('~',          out); break;
+       case EXPR_UNARY_PREFIX_INCREMENT: fputs("++",         out); break;
+       case EXPR_UNARY_PREFIX_DECREMENT: fputs("--",         out); break;
+       case EXPR_UNARY_DEREFERENCE:      fputc('*',          out); break;
+       case EXPR_UNARY_TAKE_ADDRESS:     fputc('&',          out); break;
+       case EXPR_UNARY_DELETE:           fputs("delete ",    out); break;
+       case EXPR_UNARY_DELETE_ARRAY:     fputs("delete [] ", out); break;
 
        case EXPR_UNARY_POSTFIX_INCREMENT:
                print_expression_prec(unexpr->value, prec);
@@ -463,11 +491,6 @@ static void print_unary_expression(const unary_expression_t *unexpr)
                fputs("--", out);
                return;
        case EXPR_UNARY_CAST_IMPLICIT:
-               if(!print_implicit_casts) {
-                       print_expression_prec(unexpr->value, prec);
-                       return;
-               }
-               /* fallthrough */
        case EXPR_UNARY_CAST:
                fputc('(', out);
                print_type(unexpr->base.type);
@@ -475,9 +498,18 @@ static void print_unary_expression(const unary_expression_t *unexpr)
                break;
        case EXPR_UNARY_ASSUME:
                fputs("__assume(", out);
-               print_expression_prec(unexpr->value, PREC_COMMA + 1);
+               print_assignment_expression(unexpr->value);
                fputc(')', out);
                return;
+
+       case EXPR_UNARY_THROW:
+               if (unexpr->value == NULL) {
+                       fputs("throw", out);
+                       return;
+               }
+               fputs("throw ", out);
+               break;
+
        default:
                panic("invalid unary expression found");
        }
@@ -491,7 +523,17 @@ static void print_unary_expression(const unary_expression_t *unexpr)
  */
 static void print_reference_expression(const reference_expression_t *ref)
 {
-       fprintf(out, "%s", ref->declaration->symbol->string);
+       fputs(ref->entity->base.symbol->string, out);
+}
+
+/**
+ * Prints a label address expression.
+ *
+ * @param ref   the reference expression
+ */
+static void print_label_address_expression(const label_address_expression_t *le)
+{
+       fprintf(out, "&&%s", le->label->base.symbol->string);
 }
 
 /**
@@ -502,15 +544,15 @@ static void print_reference_expression(const reference_expression_t *ref)
 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_prec(expression->index, prec);
+               print_expression(expression->index);
                fputc(']', out);
        } else {
                print_expression_prec(expression->index, prec);
                fputc('[', out);
-               print_expression_prec(expression->array_ref, prec);
+               print_expression(expression->array_ref);
                fputc(']', out);
        }
 }
@@ -528,10 +570,10 @@ static void print_typeprop_expression(const typeprop_expression_t *expression)
                assert(expression->base.kind == EXPR_ALIGNOF);
                fputs("__alignof__", out);
        }
-       if(expression->tp_expression != NULL) {
+       if (expression->tp_expression != NULL) {
                /* always print the '()' here, sizeof x is right but unusual */
                fputc('(', out);
-               print_expression_prec(expression->tp_expression, PREC_ACCESS);
+               print_expression(expression->tp_expression);
                fputc(')', out);
        } else {
                fputc('(', out);
@@ -558,7 +600,7 @@ 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_COMMA + 1);
+       print_assignment_expression(expression->value);
        fputc(')', out);
 }
 
@@ -570,14 +612,14 @@ static void print_builtin_constant(const builtin_constant_expression_t *expressi
 static void print_builtin_prefetch(const builtin_prefetch_expression_t *expression)
 {
        fputs("__builtin_prefetch(", out);
-       print_expression_prec(expression->adr, PREC_COMMA + 1);
+       print_assignment_expression(expression->adr);
        if (expression->rw) {
                fputc(',', out);
-               print_expression_prec(expression->rw, PREC_COMMA + 1);
+               print_assignment_expression(expression->rw);
        }
        if (expression->locality) {
                fputc(',', out);
-               print_expression_prec(expression->locality, PREC_COMMA + 1);
+               print_assignment_expression(expression->locality);
        }
        fputc(')', out);
 }
@@ -589,14 +631,16 @@ static void print_builtin_prefetch(const builtin_prefetch_expression_t *expressi
  */
 static void print_conditional(const conditional_expression_t *expression)
 {
-       unsigned prec = get_expression_precedence(expression->base.kind);
-       fputs("(", out);
-       print_expression_prec(expression->condition, prec);
+       print_expression_prec(expression->condition, PREC_LOGICAL_OR);
        fputs(" ? ", out);
-       print_expression_prec(expression->true_expression, prec);
-       fputs(" : ", out);
+       if (expression->true_expression != NULL) {
+               print_expression_prec(expression->true_expression, PREC_EXPRESSION);
+               fputs(" : ", out);
+       } else {
+               fputs(": ", out);
+       }
+       precedence_t prec = c_mode & _CXX ? PREC_ASSIGNMENT : PREC_CONDITIONAL;
        print_expression_prec(expression->false_expression, prec);
-       fputs(")", out);
 }
 
 /**
@@ -607,10 +651,10 @@ 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_COMMA + 1);
+       print_assignment_expression(expression->ap);
        fputs(", ", out);
-       fputs(expression->parameter->symbol->string, out);
-       fputs(")", out);
+       fputs(expression->parameter->base.base.symbol->string, out);
+       fputc(')', out);
 }
 
 /**
@@ -621,10 +665,10 @@ 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_COMMA + 1);
+       print_assignment_expression(expression->ap);
        fputs(", ", out);
        print_type(expression->base.type);
-       fputs(")", out);
+       fputc(')', out);
 }
 
 /**
@@ -636,12 +680,12 @@ 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);
        }
-       fputs(expression->symbol->string, out);
+       fputs(expression->compound_entry->base.symbol->string, out);
 }
 
 /**
@@ -653,7 +697,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_COMMA + 1);
+       print_assignment_expression(expr->type_expression);
        fputc(')', out);
 }
 
@@ -667,7 +711,7 @@ static void print_designator(const designator_t *designator)
        for ( ; designator != NULL; designator = designator->next) {
                if (designator->symbol == NULL) {
                        fputc('[', out);
-                       print_expression_prec(designator->array_index, PREC_ACCESS);
+                       print_expression(designator->array_index);
                        fputc(']', out);
                } else {
                        fputc('.', out);
@@ -711,15 +755,21 @@ static void print_statement_expression(const statement_expression_t *expression)
  */
 static void print_expression_prec(const expression_t *expression, unsigned top_prec)
 {
-       unsigned prec = get_expression_precedence(expression->base.kind);
-       if (print_parenthesis && top_prec != PREC_BOTTOM)
-               top_prec = PREC_TOP;
-       if (top_prec > prec)
+       if (expression->kind == EXPR_UNARY_CAST_IMPLICIT && !print_implicit_casts) {
+               expression = expression->unary.value;
+       }
+
+       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) {
+       switch (expression->kind) {
        case EXPR_UNKNOWN:
        case EXPR_INVALID:
-               fprintf(out, "$invalid expression$");
+               fputs("$invalid expression$", out);
                break;
        case EXPR_CHARACTER_CONSTANT:
                print_character_constant(&expression->conste);
@@ -749,11 +799,15 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p
                print_binary_expression(&expression->binary);
                break;
        case EXPR_REFERENCE:
+       case EXPR_REFERENCE_ENUM_VALUE:
                print_reference_expression(&expression->reference);
                break;
        case EXPR_ARRAY_ACCESS:
                print_array_expression(&expression->array_access);
                break;
+       case EXPR_LABEL_ADDRESS:
+               print_label_address_expression(&expression->label_address);
+               break;
        EXPR_UNARY_CASES
                print_unary_expression(&expression->unary);
                break;
@@ -794,10 +848,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);
 }
 
@@ -812,10 +866,11 @@ static void print_compound_statement(const compound_statement_t *block)
        ++indent;
 
        statement_t *statement = block->statements;
-       while(statement != NULL) {
+       while (statement != NULL) {
                if (statement->base.kind == STATEMENT_CASE_LABEL)
                        --indent;
-               print_indent();
+               if (statement->kind != STATEMENT_LABEL)
+                       print_indent();
                print_statement(statement);
 
                statement = statement->base.next;
@@ -832,10 +887,14 @@ static void print_compound_statement(const compound_statement_t *block)
  */
 static void print_return_statement(const return_statement_t *statement)
 {
-       fprintf(out, "return ");
-       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);
+       }
 }
 
 /**
@@ -856,9 +915,13 @@ static void print_expression_statement(const expression_statement_t *statement)
  */
 static void print_goto_statement(const goto_statement_t *statement)
 {
-       fprintf(out, "goto ");
-       fputs(statement->label->symbol->string, out);
-       fprintf(stderr, "(%p)", (void*) statement->label);
+       fputs("goto ", out);
+       if (statement->expression != NULL) {
+               fputc('*', out);
+               print_expression(statement->expression);
+       } else {
+               fputs(statement->label->base.symbol->string, out);
+       }
        fputs(";\n", out);
 }
 
@@ -869,8 +932,8 @@ static void print_goto_statement(const goto_statement_t *statement)
  */
 static void print_label_statement(const label_statement_t *statement)
 {
-       fprintf(stderr, "(%p)", (void*) statement->label);
-       fprintf(out, "%s:\n", statement->label->symbol->string);
+       fprintf(out, "%s:\n", statement->label->base.symbol->string);
+       print_indent();
        print_statement(statement->statement);
 }
 
@@ -886,7 +949,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);
@@ -913,7 +976,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);
@@ -925,7 +988,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;
                }
@@ -934,6 +997,47 @@ 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);
+       fputc(';', out);
+}
+
+/**
+ * returns true if the entity is a compiler generated one and has no real
+ * correspondenc in the source file
+ */
+static bool is_generated_entity(const entity_t *entity)
+{
+       if (entity->kind == ENTITY_TYPEDEF)
+               return entity->typedefe.builtin;
+
+       if (is_declaration(entity))
+               return entity->declaration.implicit;
+
+       return false;
+}
+
 /**
  * Print a declaration statement.
  *
@@ -942,19 +1046,33 @@ static void print_case_label(const case_label_statement_t *statement)
 static void print_declaration_statement(
                const declaration_statement_t *statement)
 {
-       int first = 1;
-       declaration_t *declaration = statement->declarations_begin;
-       for( ; declaration != statement->declarations_end->next;
-              declaration = declaration->next) {
-           if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY)
-               continue;
+       bool first = true;
+       entity_t *entity = statement->declarations_begin;
+       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 (!is_declaration(entity) && entity->kind != ENTITY_TYPEDEF)
+                       continue;
+               if (is_generated_entity(entity))
+                       continue;
 
-               if(!first) {
+               if (!first) {
                        print_indent();
                } else {
-                       first = 0;
+                       first = false;
+               }
+
+               if (entity->kind == ENTITY_TYPEDEF) {
+                       print_typedef(entity);
+               } else {
+                       assert(is_declaration(entity));
+                       print_declaration(entity);
                }
-               print_declaration(declaration);
+
                fputc('\n', out);
        }
 }
@@ -995,27 +1113,32 @@ 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);
-       if(statement->scope.declarations != NULL) {
+       entity_t *entity = statement->scope.entities;
+       while (entity != NULL && is_generated_entity(entity))
+               entity = entity->base.next;
+
+       if (entity != NULL) {
                assert(statement->initialisation == NULL);
-               print_declaration(statement->scope.declarations);
-               if(statement->scope.declarations->next != NULL) {
+               assert(is_declaration(entity));
+               print_declaration(entity);
+               if (entity->base.next != NULL) {
                        panic("multiple declarations in for statement not supported yet");
                }
                fputc(' ', out);
        } else {
-               if(statement->initialisation) {
+               if (statement->initialisation) {
                        print_expression(statement->initialisation);
                }
                fputs("; ", out);
        }
-       if(statement->condition != NULL) {
+       if (statement->condition != NULL) {
                print_expression(statement->condition);
        }
        fputs("; ", out);
-       if(statement->step != NULL) {
+       if (statement->step != NULL) {
                print_expression(statement->step);
        }
-       fputs(")", out);
+       fputs(") ", out);
        print_statement(statement->body);
 }
 
@@ -1027,17 +1150,17 @@ 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, '"');
+               print_quoted_string(&argument->constraints, '"', 1);
                fputs(" (", out);
                print_expression(argument->expression);
-               fputs(")", out);
+               fputc(')', out);
        }
 }
 
@@ -1049,11 +1172,11 @@ 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, '"');
+               print_quoted_string(&clobber->clobber, '"', 1);
        }
 }
 
@@ -1065,23 +1188,24 @@ 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);
        }
-       fputs("(", out);
-       print_quoted_string(&statement->asm_text, '"');
-       if(statement->inputs == NULL && statement->outputs == NULL
-                       && statement->clobbers == NULL)
+       fputc('(', out);
+       print_quoted_string(&statement->asm_text, '"', 1);
+       if (statement->outputs  == NULL &&
+           statement->inputs   == NULL &&
+           statement->clobbers == NULL)
                goto end_of_print_asm_statement;
 
        fputs(" : ", out);
-       print_asm_arguments(statement->inputs);
-       if(statement->outputs == NULL && statement->clobbers == NULL)
+       print_asm_arguments(statement->outputs);
+       if (statement->inputs == NULL && statement->clobbers == NULL)
                goto end_of_print_asm_statement;
 
        fputs(" : ", out);
-       print_asm_arguments(statement->outputs);
-       if(statement->clobbers == NULL)
+       print_asm_arguments(statement->inputs);
+       if (statement->clobbers == NULL)
                goto end_of_print_asm_statement;
 
        fputs(" : ", out);
@@ -1101,7 +1225,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);
@@ -1118,7 +1242,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);
 }
 
@@ -1129,7 +1253,7 @@ static void print_leave_statement(const leave_statement_t *statement)
  */
 void print_statement(const statement_t *statement)
 {
-       switch(statement->kind) {
+       switch (statement->kind) {
        case STATEMENT_EMPTY:
                fputs(";\n", out);
                break;
@@ -1145,6 +1269,9 @@ 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;
@@ -1185,7 +1312,7 @@ void print_statement(const statement_t *statement)
                print_leave_statement(&statement->leave);
                break;
        case STATEMENT_INVALID:
-               fprintf(out, "$invalid statement$");
+               fputs("$invalid statement$\n", out);
                break;
        }
 }
@@ -1197,19 +1324,16 @@ void print_statement(const statement_t *statement)
  */
 static void print_storage_class(storage_class_tag_t storage_class)
 {
-       switch(storage_class) {
-       case STORAGE_CLASS_ENUM_ENTRY:
-       case STORAGE_CLASS_NONE:
-               break;
-       case STORAGE_CLASS_TYPEDEF:       fputs("typedef ",        out); break;
-       case STORAGE_CLASS_EXTERN:        fputs("extern ",         out); break;
-       case STORAGE_CLASS_STATIC:        fputs("static ",         out); break;
-       case STORAGE_CLASS_AUTO:          fputs("auto ",           out); break;
-       case STORAGE_CLASS_REGISTER:      fputs("register ",       out); break;
-       case STORAGE_CLASS_THREAD:        fputs("__thread",        out); break;
-       case STORAGE_CLASS_THREAD_EXTERN: fputs("extern __thread", out); break;
-       case STORAGE_CLASS_THREAD_STATIC: fputs("static __thread", out); break;
+       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;
        }
+       fputs(text, out);
 }
 
 /**
@@ -1219,15 +1343,15 @@ 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;
        }
 
-       switch(initializer->kind) {
+       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: {
@@ -1235,11 +1359,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);
                        }
                }
@@ -1247,10 +1371,10 @@ void print_initializer(const initializer_t *initializer)
                return;
        }
        case INITIALIZER_STRING:
-               print_quoted_string(&initializer->string.string, '"');
+               print_quoted_string(&initializer->string.string, '"', 1);
                return;
        case INITIALIZER_WIDE_STRING:
-               print_quoted_wide_string(&initializer->wide_string.string, '"');
+               print_quoted_wide_string(&initializer->wide_string.string, '"', 1);
                return;
        case INITIALIZER_DESIGNATOR:
                print_designator(initializer->designator.designator);
@@ -1264,106 +1388,171 @@ void print_initializer(const initializer_t *initializer)
 /**
  * Print microsoft extended declaration modifiers.
  */
-static void print_ms_modifiers(const declaration_t *declaration) {
-       if((c_mode & _MS) == 0)
+static void print_ms_modifiers(const declaration_t *declaration)
+{
+       if ((c_mode & _MS) == 0)
                return;
 
        decl_modifiers_t modifiers = declaration->modifiers;
 
-       /* DM_FORCEINLINE handled outside. */
-       if((modifiers & ~DM_FORCEINLINE) != 0 ||
-           declaration->alignment != 0 || declaration->deprecated != 0 ||
-           declaration->get_property_sym != NULL || declaration->put_property_sym != NULL) {
-               char *next = "(";
+       bool        ds_shown = false;
+       const char *next     = "(";
+
+       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) {
+                               fputs("__declspec", out);
+                               ds_shown = true;
+                       }
 
-               fputs("__declspec", out);
-               if(modifiers & DM_DLLIMPORT) {
+                       if (variable->alignment != 0) {
+                               fputs(next, out); next = ", "; fprintf(out, "align(%u)", variable->alignment);
+                       }
+                       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) {
+                                       fprintf(out, "get=%s", variable->get_property_sym->string);
+                                       comma = ", ";
+                               }
+                               if (variable->put_property_sym != NULL)
+                                       fprintf(out, "%sput=%s", comma, variable->put_property_sym->string);
+                               fputc(')', out);
+                       }
+               }
+       }
+
+       /* DM_FORCEINLINE handled outside. */
+       if ((modifiers & ~DM_FORCEINLINE) != 0) {
+               if (!ds_shown) {
+                       fputs("__declspec", out);
+                       ds_shown = true;
+               }
+               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(declaration->deprecated != 0) {
+               if (modifiers & DM_DEPRECATED) {
                        fputs(next, out); next = ", "; fputs("deprecated", out);
-                       if(declaration->deprecated_string != NULL)
-                               fprintf(out, "(\"%s\")", declaration->deprecated_string);
-               }
-               if(declaration->alignment != 0) {
-                       fputs(next, out); next = ", "; fprintf(out, "align(%u)", declaration->alignment);
+                       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);
                }
-           if(declaration->get_property_sym != NULL || declaration->put_property_sym != NULL) {
-               char *comma = "";
-                       fputs(next, out); next = ", "; fprintf(out, "property(");
-               if(declaration->get_property_sym != NULL) {
-                       fprintf(out, "get=%s", declaration->get_property_sym->string);
-                       comma = ", ";
-                       }
-               if(declaration->put_property_sym != NULL)
-                       fprintf(out, "%sput=%s", comma, declaration->put_property_sym->string);
-                       fputc(')', out);
-               }
+       }
+
+       if (ds_shown)
                fputs(") ", out);
+}
+
+static void print_scope(const scope_t *scope)
+{
+       const entity_t *entity = scope->entities;
+       for ( ; entity != NULL; entity = entity->base.next) {
+               print_indent();
+               print_entity(entity);
+               fputs("\n", out);
        }
 }
 
+static void print_namespace(const namespace_t *namespace)
+{
+       fputs("namespace ", out);
+       if (namespace->base.symbol != NULL) {
+               fputs(namespace->base.symbol->string, out);
+               fputc(' ', out);
+       }
+
+       fputs("{\n", out);
+       ++indent;
+
+       print_scope(&namespace->members);
+
+       --indent;
+       print_indent();
+       fputs("}\n", out);
+}
+
 /**
- * Print a declaration in the NORMAL namespace.
- *
- * @param declaration  the declaration
+ * Print a variable or function declaration
  */
-static void print_normal_declaration(const declaration_t *declaration)
-{
-       print_storage_class((storage_class_tag_t) declaration->declared_storage_class);
-       if(declaration->is_inline) {
-               if(declaration->modifiers & DM_FORCEINLINE)
-                       fputs("__forceinline ", out);
-               else {
-                       if(declaration->modifiers & DM_MICROSOFT_INLINE)
+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);
+       if (entity->kind == ENTITY_FUNCTION) {
+               function_t *function = (function_t*)declaration;
+               if (function->is_inline) {
+                       if (declaration->modifiers & DM_FORCEINLINE) {
+                               fputs("__forceinline ", out);
+                       } else if (declaration->modifiers & DM_MICROSOFT_INLINE) {
                                fputs("__inline ", out);
-                       else
+                       } else {
                                fputs("inline ", out);
+                       }
                }
        }
        print_ms_modifiers(declaration);
-       print_type_ext(declaration->type, declaration->symbol,
-                      &declaration->scope);
+       switch (entity->kind) {
+               case ENTITY_FUNCTION:
+                       print_type_ext(entity->declaration.type, entity->base.symbol,
+                                       &entity->function.parameters);
+
+                       if (entity->function.statement != NULL) {
+                               fputc('\n', out);
+                               print_indent();
+                               print_statement(entity->function.statement);
+                               return;
+                       }
+                       break;
 
-       if(declaration->type->kind == TYPE_FUNCTION) {
-               if(declaration->init.statement != NULL) {
-                       fputs("\n", out);
-                       print_statement(declaration->init.statement);
-                       return;
-               }
-       } else if(declaration->init.initializer != NULL) {
-               fputs(" = ", out);
-               print_initializer(declaration->init.initializer);
+               case ENTITY_VARIABLE:
+                       if (entity->variable.thread_local)
+                               fputs("__thread ", out);
+                       print_type_ext(declaration->type, declaration->base.symbol, NULL);
+                       if (entity->variable.initializer != NULL) {
+                               fputs(" = ", out);
+                               print_initializer(entity->variable.initializer);
+                       }
+                       break;
+
+               default:
+                       print_type_ext(declaration->type, declaration->base.symbol, NULL);
+                       break;
        }
        fputc(';', out);
 }
@@ -1373,7 +1562,8 @@ static void print_normal_declaration(const declaration_t *declaration)
  *
  * @param expression  the expression
  */
-void print_expression(const expression_t *expression) {
+void print_expression(const expression_t *expression)
+{
        print_expression_prec(expression, PREC_BOTTOM);
 }
 
@@ -1382,38 +1572,59 @@ void print_expression(const expression_t *expression) {
  *
  * @param declaration  the declaration
  */
-void print_declaration(const declaration_t *declaration)
+void print_entity(const entity_t *entity)
 {
-       if(declaration->namespc != NAMESPACE_NORMAL &&
-                       declaration->symbol == NULL)
+       if (entity->base.namespc != NAMESPACE_NORMAL && entity->base.symbol == NULL)
                return;
 
-       switch(declaration->namespc) {
-       case NAMESPACE_NORMAL:
-               print_normal_declaration(declaration);
-               break;
-       case NAMESPACE_STRUCT:
+       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;
+       case ENTITY_TYPEDEF:
+               print_typedef(entity);
+               return;
+       case ENTITY_STRUCT:
                fputs("struct ", out);
-               fputs(declaration->symbol->string, out);
-               fputc(' ', out);
-               print_compound_definition(declaration);
+               fputs(entity->base.symbol->string, out);
+               if (entity->structe.complete) {
+                       fputc(' ', out);
+                       print_compound_definition(&entity->structe);
+               }
                fputc(';', out);
-               break;
-       case NAMESPACE_UNION:
+               return;
+       case ENTITY_UNION:
                fputs("union ", out);
-               fputs(declaration->symbol->string, out);
-               fputc(' ', out);
-               print_compound_definition(declaration);
+               fputs(entity->base.symbol->string, out);
+               if (entity->unione.complete) {
+                       fputc(' ', out);
+                       print_compound_definition(&entity->unione);
+               }
                fputc(';', out);
-               break;
-       case NAMESPACE_ENUM:
+               return;
+       case ENTITY_ENUM:
                fputs("enum ", out);
-               fputs(declaration->symbol->string, out);
+               fputs(entity->base.symbol->string, out);
                fputc(' ', out);
-               print_enum_definition(declaration);
+               print_enum_definition(&entity->enume);
                fputc(';', out);
+               return;
+       case ENTITY_NAMESPACE:
+               print_namespace(&entity->namespacee);
+               return;
+       case ENTITY_LABEL:
+       case ENTITY_ENUM_VALUE:
+       case ENTITY_LOCAL_LABEL:
+               panic("print_entity used on unexpected entity type");
+       case ENTITY_INVALID:
                break;
        }
+       panic("Invalid entity type encountered");
 }
 
 /**
@@ -1425,23 +1636,25 @@ void print_ast(const translation_unit_t *unit)
 {
        inc_type_visited();
 
-       declaration_t *declaration = unit->scope.declarations;
-       for( ; declaration != NULL; declaration = declaration->next) {
-               if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY)
+       entity_t *entity = unit->scope.entities;
+       for ( ; entity != NULL; entity = entity->base.next) {
+               if (entity->kind == ENTITY_ENUM_VALUE)
                        continue;
-               if(declaration->namespc != NAMESPACE_NORMAL &&
-                               declaration->symbol == NULL)
+               if (entity->base.namespc != NAMESPACE_NORMAL
+                               && entity->base.symbol == NULL)
+                       continue;
+               if (is_generated_entity(entity))
                        continue;
 
                print_indent();
-               print_declaration(declaration);
+               print_entity(entity);
                fputc('\n', out);
        }
 }
 
 bool is_constant_initializer(const initializer_t *initializer)
 {
-       switch(initializer->kind) {
+       switch (initializer->kind) {
        case INITIALIZER_STRING:
        case INITIALIZER_WIDE_STRING:
        case INITIALIZER_DESIGNATOR:
@@ -1451,9 +1664,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;
@@ -1463,12 +1676,13 @@ bool is_constant_initializer(const initializer_t *initializer)
 
 static bool is_object_with_linker_constant_address(const expression_t *expression)
 {
-       switch(expression->kind) {
+       switch (expression->kind) {
        case EXPR_UNARY_DEREFERENCE:
                return is_address_constant(expression->unary.value);
 
        case EXPR_SELECT: {
-               if(is_type_pointer(expression->select.compound->base.type)) {
+               type_t *base_type = skip_typeref(expression->select.compound->base.type);
+               if (is_type_pointer(base_type)) {
                        /* it's a -> */
                        return is_address_constant(expression->select.compound);
                } else {
@@ -1481,15 +1695,23 @@ static bool is_object_with_linker_constant_address(const expression_t *expressio
                        && is_address_constant(expression->array_access.array_ref);
 
        case EXPR_REFERENCE: {
-               declaration_t *declaration = expression->reference.declaration;
-               switch((storage_class_tag_t) declaration->storage_class) {
-               case STORAGE_CLASS_NONE:
-               case STORAGE_CLASS_EXTERN:
-               case STORAGE_CLASS_STATIC:
-                       return true;
-               default:
-                       return false;
+               entity_t *entity = expression->reference.entity;
+               if (is_declaration(entity)) {
+                       switch ((storage_class_tag_t)entity->declaration.storage_class) {
+                       case STORAGE_CLASS_NONE:
+                       case STORAGE_CLASS_EXTERN:
+                       case STORAGE_CLASS_STATIC:
+                               return
+                                       entity->kind != ENTITY_VARIABLE ||
+                                       !entity->variable.thread_local;
+
+                       case STORAGE_CLASS_REGISTER:
+                       case STORAGE_CLASS_TYPEDEF:
+                       case STORAGE_CLASS_AUTO:
+                               break;
+                       }
                }
+               return false;
        }
 
        default:
@@ -1499,7 +1721,7 @@ static bool is_object_with_linker_constant_address(const expression_t *expressio
 
 bool is_address_constant(const expression_t *expression)
 {
-       switch(expression->kind) {
+       switch (expression->kind) {
        case EXPR_UNARY_TAKE_ADDRESS:
                return is_object_with_linker_constant_address(expression->unary.value);
 
@@ -1507,19 +1729,19 @@ 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: {
                type_t *dest = skip_typeref(expression->base.type);
-               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()))))
+               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())
+                   ))
                        return false;
 
                return (is_constant_expression(expression->unary.value)
@@ -1531,9 +1753,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);
                }
 
@@ -1541,16 +1763,31 @@ bool is_address_constant(const expression_t *expression)
        }
 
        case EXPR_REFERENCE: {
-               declaration_t *declaration = expression->reference.declaration;
-               type_t *type = skip_typeref(declaration->type);
-               if(is_type_function(type))
+               entity_t *entity = expression->reference.entity;
+               if (!is_declaration(entity))
+                       return false;
+
+               type_t *type = skip_typeref(entity->declaration.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 */
+               if (!is_type_valid(type))
+                       return true;
                return false;
        }
 
+       case EXPR_ARRAY_ACCESS: {
+               type_t *const type =
+                       skip_typeref(revert_automatic_type_conversion(expression));
+               return
+                       is_type_array(type)                                    &&
+                       is_constant_expression(expression->array_access.index) &&
+                       is_address_constant(expression->array_access.array_ref);
+       }
+
        default:
                return false;
        }
@@ -1567,9 +1804,12 @@ static bool is_builtin_const_call(const expression_t *expression)
 
        switch (symbol->ID) {
        case T___builtin_huge_val:
+       case T___builtin_inf:
+       case T___builtin_inff:
+       case T___builtin_infl:
        case T___builtin_nan:
        case T___builtin_nanf:
-       case T___builtin_nand:
+       case T___builtin_nanl:
                return true;
        }
 
@@ -1582,8 +1822,6 @@ static bool is_constant_pointer(const expression_t *expression)
                return true;
 
        switch (expression->kind) {
-       case EXPR_SELECT:
-               return is_constant_pointer(expression->select.compound);
        case EXPR_UNARY_CAST:
                return is_constant_pointer(expression->unary.value);
        default:
@@ -1593,20 +1831,28 @@ static bool is_constant_pointer(const expression_t *expression)
 
 static bool is_object_with_constant_address(const expression_t *expression)
 {
-       switch(expression->kind) {
+       switch (expression->kind) {
        case EXPR_SELECT: {
                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);
                }
        }
-       case EXPR_ARRAY_ACCESS:
-               return is_constant_pointer(expression->array_access.array_ref)
-                       && is_constant_expression(expression->array_access.index);
+
+       case EXPR_ARRAY_ACCESS: {
+               array_access_expression_t const* const array_access =
+                       &expression->array_access;
+               return
+                       is_constant_expression(array_access->index) && (
+                               is_object_with_constant_address(array_access->array_ref) ||
+                               is_constant_pointer(array_access->array_ref)
+                       );
+       }
+
        case EXPR_UNARY_DEREFERENCE:
                return is_constant_pointer(expression->unary.value);
        default:
@@ -1616,33 +1862,49 @@ static bool is_object_with_constant_address(const expression_t *expression)
 
 bool is_constant_expression(const expression_t *expression)
 {
-       switch(expression->kind) {
+       switch (expression->kind) {
 
        case EXPR_CONST:
        case EXPR_CHARACTER_CONSTANT:
        case EXPR_WIDE_CHARACTER_CONSTANT:
        case EXPR_STRING_LITERAL:
        case EXPR_WIDE_STRING_LITERAL:
-       case EXPR_SIZEOF:
        case EXPR_CLASSIFY_TYPE:
        case EXPR_FUNCNAME:
        case EXPR_OFFSETOF:
        case EXPR_ALIGNOF:
        case EXPR_BUILTIN_CONSTANT_P:
+       case EXPR_LABEL_ADDRESS:
+       case EXPR_REFERENCE_ENUM_VALUE:
                return true;
 
+       case EXPR_SIZEOF: {
+               type_t *type = expression->typeprop.type;
+               if (type == NULL)
+                       type = expression->typeprop.tp_expression->base.type;
+
+               type = skip_typeref(type);
+               if (is_type_array(type) && type->array.is_vla)
+                       return false;
+               return true;
+       }
+
        case EXPR_BUILTIN_SYMBOL:
        case EXPR_BUILTIN_PREFETCH:
        case EXPR_SELECT:
        case EXPR_VA_START:
        case EXPR_VA_ARG:
        case EXPR_STATEMENT:
+       case EXPR_REFERENCE:
        case EXPR_UNARY_POSTFIX_INCREMENT:
        case EXPR_UNARY_POSTFIX_DECREMENT:
        case EXPR_UNARY_PREFIX_INCREMENT:
        case EXPR_UNARY_PREFIX_DECREMENT:
        case EXPR_UNARY_ASSUME: /* has VOID type */
        case EXPR_UNARY_DEREFERENCE:
+       case EXPR_UNARY_DELETE:
+       case EXPR_UNARY_DELETE_ARRAY:
+       case EXPR_UNARY_THROW:
        case EXPR_BINARY_ASSIGN:
        case EXPR_BINARY_MUL_ASSIGN:
        case EXPR_BINARY_DIV_ASSIGN:
@@ -1655,6 +1917,7 @@ bool is_constant_expression(const expression_t *expression)
        case EXPR_BINARY_BITWISE_XOR_ASSIGN:
        case EXPR_BINARY_BITWISE_OR_ASSIGN:
        case EXPR_BINARY_COMMA:
+       case EXPR_ARRAY_ACCESS:
                return false;
 
        case EXPR_UNARY_TAKE_ADDRESS:
@@ -1692,7 +1955,6 @@ bool is_constant_expression(const expression_t *expression)
        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:
@@ -1707,28 +1969,16 @@ bool is_constant_expression(const expression_t *expression)
 
        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)
+               if (val != 0)
                        return is_constant_expression(expression->conditional.true_expression);
                else
                        return is_constant_expression(expression->conditional.false_expression);
        }
 
-       case EXPR_ARRAY_ACCESS:
-               return is_constant_expression(expression->array_access.array_ref)
-                       && is_constant_expression(expression->array_access.index);
-
-       case EXPR_REFERENCE: {
-               declaration_t *declaration = expression->reference.declaration;
-               if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY)
-                       return true;
-
-               return false;
-       }
-
        case EXPR_INVALID:
                return true;