cleanup: Add and use macro MIN().
[cparser] / ast.c
diff --git a/ast.c b/ast.c
index a2812b8..baa472d 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -1,21 +1,6 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Copyright (C) 2012 Matthias Braun <matze@braunis.de>
  */
 #include <config.h>
 
 #include "type_t.h"
 #include "parser.h"
 #include "lang_features.h"
-#include "entity_t.h"
 #include "printer.h"
+#include "separator_t.h"
 #include "types.h"
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <ctype.h>
 
-#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;
 
 static int indent;
+static int case_indent;
 
 bool print_implicit_casts = false;
 bool print_parenthesis = false;
@@ -63,19 +38,7 @@ void change_indent(int delta)
 void print_indent(void)
 {
        for (int i = 0; i < indent; ++i)
-               print_string("\t");
-}
-
-static void print_symbol(const symbol_t *symbol)
-{
-       print_string(symbol->string);
-}
-
-static void print_stringrep(const string_t *string)
-{
-       for (size_t i = 0; i < string->size; ++i) {
-               print_char(string->begin[i]);
-       }
+               print_char('\t');
 }
 
 /**
@@ -105,93 +68,88 @@ 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_LITERAL_INTEGER]                   = PREC_PRIMARY,
-               [EXPR_LITERAL_INTEGER_OCTAL]             = PREC_PRIMARY,
-               [EXPR_LITERAL_INTEGER_HEXADECIMAL]       = PREC_PRIMARY,
-               [EXPR_LITERAL_FLOATINGPOINT]             = PREC_PRIMARY,
-               [EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL] = PREC_PRIMARY,
-               [EXPR_LITERAL_CHARACTER]                 = PREC_PRIMARY,
-               [EXPR_LITERAL_WIDE_CHARACTER]            = PREC_PRIMARY,
-               [EXPR_LITERAL_MS_NOOP]                   = 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_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_VA_COPY]                           = 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
+               [EXPR_ERROR]                      = PREC_PRIMARY,
+               [EXPR_REFERENCE]                  = PREC_PRIMARY,
+               [EXPR_ENUM_CONSTANT]              = PREC_PRIMARY,
+               [EXPR_LITERAL_INTEGER]            = PREC_PRIMARY,
+               [EXPR_LITERAL_FLOATINGPOINT]      = PREC_PRIMARY,
+               [EXPR_LITERAL_CHARACTER]          = PREC_PRIMARY,
+               [EXPR_LITERAL_MS_NOOP]            = PREC_PRIMARY,
+               [EXPR_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_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_VA_COPY]                    = PREC_PRIMARY,
+               [EXPR_STATEMENT]                  = PREC_PRIMARY,
+               [EXPR_LABEL_ADDRESS]              = PREC_PRIMARY,
+
+               [EXPR_UNARY_NEGATE]               = PREC_UNARY,
+               [EXPR_UNARY_PLUS]                 = PREC_UNARY,
+               [EXPR_UNARY_COMPLEMENT]           = 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_ASSUME]               = PREC_PRIMARY,
+               [EXPR_UNARY_DELETE]               = PREC_UNARY,
+               [EXPR_UNARY_DELETE_ARRAY]         = PREC_UNARY,
+               [EXPR_UNARY_THROW]                = PREC_ASSIGNMENT,
+               [EXPR_UNARY_IMAG]                 = PREC_UNARY,
+               [EXPR_UNARY_REAL]                 = PREC_UNARY,
+
+               [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((size_t)kind < lengthof(prec));
        unsigned res = prec[kind];
@@ -205,17 +163,17 @@ static unsigned get_expression_precedence(expression_kind_t kind)
  *
  * @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,
-                                int skip)
+static void print_quoted_string(const string_t *const string, char border)
 {
+       print_string(get_string_encoding_prefix(string->encoding));
+
        print_char(border);
-       const char *end = string->begin + string->size - skip;
+       const char *end = string->begin + string->size;
        for (const char *c = string->begin; c != end; ++c) {
-               unsigned char const tc = *c;
+               const char tc = *c;
                if (tc == border) {
-                       print_string("\\");
+                       print_char('\\');
                }
                switch (tc) {
                case '\\': print_string("\\\\"); break;
@@ -233,7 +191,7 @@ static void print_quoted_string(const string_t *const string, char border,
                        }
                        /* FALLTHROUGH */
                default:
-                       if (tc < 0x80 && !isprint(tc)) {
+                       if ((unsigned)tc < 0x80 && !isprint(tc)) {
                                print_format("\\%03o", (unsigned)tc);
                        } else {
                                print_char(tc);
@@ -244,12 +202,9 @@ static void print_quoted_string(const string_t *const string, char border,
        print_char(border);
 }
 
-static void print_string_literal(const string_literal_expression_t *literal)
+static void print_string_literal(string_literal_expression_t const *const literal, char const delimiter)
 {
-       if (literal->base.kind == EXPR_WIDE_STRING_LITERAL) {
-               print_char('L');
-       }
-       print_quoted_string(&literal->value, '"', 1);
+       print_quoted_string(&literal->value, delimiter);
 }
 
 static void print_literal(const literal_expression_t *literal)
@@ -258,24 +213,13 @@ static void print_literal(const literal_expression_t *literal)
        case EXPR_LITERAL_MS_NOOP:
                print_string("__noop");
                return;
-       case EXPR_LITERAL_INTEGER_HEXADECIMAL:
-       case EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL:
-               print_string("0x");
-               /* FALLTHROUGH */
+
        case EXPR_LITERAL_BOOLEAN:
-       case EXPR_LITERAL_INTEGER:
-       case EXPR_LITERAL_INTEGER_OCTAL:
        case EXPR_LITERAL_FLOATINGPOINT:
-               print_stringrep(&literal->value);
-               if (literal->suffix != NULL)
-                       print_symbol(literal->suffix);
-               return;
-       case EXPR_LITERAL_WIDE_CHARACTER:
-               print_char('L');
-               /* FALLTHROUGH */
-       case EXPR_LITERAL_CHARACTER:
-               print_quoted_string(&literal->value, '\'', 0);
+       case EXPR_LITERAL_INTEGER:
+               print_string(literal->value.begin);
                return;
+
        default:
                break;
        }
@@ -300,9 +244,9 @@ static void print_funcname(const funcname_expression_t *funcname)
 static void print_compound_literal(
                const compound_literal_expression_t *expression)
 {
-       print_string("(");
+       print_char('(');
        print_type(expression->type);
-       print_string(")");
+       print_char(')');
        print_initializer(expression->initializer);
 }
 
@@ -319,20 +263,13 @@ static void print_assignment_expression(const expression_t *const expr)
 static void print_call_expression(const call_expression_t *call)
 {
        print_expression_prec(call->function, PREC_POSTFIX);
-       print_string("(");
-       call_argument_t *argument = call->arguments;
-       int              first    = 1;
-       while (argument != NULL) {
-               if (!first) {
-                       print_string(", ");
-               } else {
-                       first = 0;
-               }
-               print_assignment_expression(argument->expression);
-
-               argument = argument->next;
+       print_char('(');
+       separator_t sep = { "", ", " };
+       for (call_argument_t const *arg = call->arguments; arg; arg = arg->next) {
+               print_string(sep_next(&sep));
+               print_assignment_expression(arg->expression);
        }
-       print_string(")");
+       print_char(')');
 }
 
 /**
@@ -394,16 +331,18 @@ 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:           print_string("-"); break;
-       case EXPR_UNARY_PLUS:             print_string("+"); break;
-       case EXPR_UNARY_NOT:              print_string("!"); break;
-       case EXPR_UNARY_BITWISE_NEGATE:   print_string("~"); break;
-       case EXPR_UNARY_PREFIX_INCREMENT: print_string("++"); break;
-       case EXPR_UNARY_PREFIX_DECREMENT: print_string("--"); break;
-       case EXPR_UNARY_DEREFERENCE:      print_string("*"); break;
-       case EXPR_UNARY_TAKE_ADDRESS:     print_string("&"); break;
-       case EXPR_UNARY_DELETE:           print_string("delete "); break;
+       case EXPR_UNARY_NEGATE:           print_char  ('-' );         break;
+       case EXPR_UNARY_PLUS:             print_char  ('+' );         break;
+       case EXPR_UNARY_NOT:              print_char  ('!' );         break;
+       case EXPR_UNARY_COMPLEMENT:       print_char  ('~' );         break;
+       case EXPR_UNARY_PREFIX_INCREMENT: print_string("++");         break;
+       case EXPR_UNARY_PREFIX_DECREMENT: print_string("--");         break;
+       case EXPR_UNARY_DEREFERENCE:      print_char  ('*' );         break;
+       case EXPR_UNARY_TAKE_ADDRESS:     print_char  ('&' );         break;
+       case EXPR_UNARY_DELETE:           print_string("delete ");    break;
        case EXPR_UNARY_DELETE_ARRAY:     print_string("delete [] "); break;
+       case EXPR_UNARY_REAL:             print_string("__real__ ");  break;
+       case EXPR_UNARY_IMAG:             print_string("__imag__ ");  break;
 
        case EXPR_UNARY_POSTFIX_INCREMENT:
                print_expression_prec(unexpr->value, prec);
@@ -413,18 +352,16 @@ static void print_unary_expression(const unary_expression_t *unexpr)
                print_expression_prec(unexpr->value, prec);
                print_string("--");
                return;
-       case EXPR_UNARY_CAST_IMPLICIT:
        case EXPR_UNARY_CAST:
-               print_string("(");
+               print_char('(');
                print_type(unexpr->base.type);
-               print_string(")");
+               print_char(')');
                break;
        case EXPR_UNARY_ASSUME:
                print_string("__assume(");
                print_assignment_expression(unexpr->value);
-               print_string(")");
+               print_char(')');
                return;
-
        case EXPR_UNARY_THROW:
                if (unexpr->value == NULL) {
                        print_string("throw");
@@ -468,14 +405,14 @@ static void print_array_expression(const array_access_expression_t *expression)
 {
        if (!expression->flipped) {
                print_expression_prec(expression->array_ref, PREC_POSTFIX);
-               print_string("[");
+               print_char('[');
                print_expression(expression->index);
-               print_string("]");
+               print_char(']');
        } else {
                print_expression_prec(expression->index, PREC_POSTFIX);
-               print_string("[");
+               print_char('[');
                print_expression(expression->array_ref);
-               print_string("]");
+               print_char(']');
        }
 }
 
@@ -486,19 +423,18 @@ static void print_array_expression(const array_access_expression_t *expression)
  */
 static void print_typeprop_expression(const typeprop_expression_t *expression)
 {
-       if (expression->base.kind == EXPR_SIZEOF) {
-               print_string("sizeof");
-       } else {
-               assert(expression->base.kind == EXPR_ALIGNOF);
-               print_string("__alignof__");
+       switch (expression->base.kind) {
+       case EXPR_SIZEOF:  print_string("sizeof");                                   break;
+       case EXPR_ALIGNOF: print_string(c_mode & _C11 ? "_Alignof" : "__alignof__"); break;
+       default:           panic("invalid typeprop kind");
        }
        if (expression->tp_expression != NULL) {
                /* PREC_TOP: always print the '()' here, sizeof x is right but unusual */
                print_expression_prec(expression->tp_expression, PREC_TOP);
        } else {
-               print_string("(");
+               print_char('(');
                print_type(expression->type);
-               print_string(")");
+               print_char(')');
        }
 }
 
@@ -511,7 +447,7 @@ static void print_builtin_constant(const builtin_constant_expression_t *expressi
 {
        print_string("__builtin_constant_p(");
        print_assignment_expression(expression->value);
-       print_string(")");
+       print_char(')');
 }
 
 /**
@@ -526,7 +462,7 @@ static void print_builtin_types_compatible(
        print_type(expression->left);
        print_string(", ");
        print_type(expression->right);
-       print_string(")");
+       print_char(')');
 }
 
 /**
@@ -558,8 +494,8 @@ static void print_va_start(const va_start_expression_t *const expression)
        print_string("__builtin_va_start(");
        print_assignment_expression(expression->ap);
        print_string(", ");
-       print_string(expression->parameter->base.base.symbol->string);
-       print_string(")");
+       print_assignment_expression(expression->parameter);
+       print_char(')');
 }
 
 /**
@@ -573,7 +509,7 @@ static void print_va_arg(const va_arg_expression_t *expression)
        print_assignment_expression(expression->ap);
        print_string(", ");
        print_type(expression->base.type);
-       print_string(")");
+       print_char(')');
 }
 
 /**
@@ -587,7 +523,7 @@ static void print_va_copy(const va_copy_expression_t *expression)
        print_assignment_expression(expression->dst);
        print_string(", ");
        print_assignment_expression(expression->src);
-       print_string(")");
+       print_char(')');
 }
 
 /**
@@ -598,10 +534,16 @@ static void print_va_copy(const va_copy_expression_t *expression)
 static void print_select(const select_expression_t *expression)
 {
        print_expression_prec(expression->compound, PREC_POSTFIX);
+       /* do not print anything for anonymous struct/union selects
+        * FIXME: if the anonymous select was a '->' this will print '.'
+        */
+       if (expression->compound_entry->base.symbol == NULL)
+               return;
+
        if (is_type_pointer(skip_typeref(expression->compound->base.type))) {
                print_string("->");
        } else {
-               print_string(".");
+               print_char('.');
        }
        print_string(expression->compound_entry->base.symbol->string);
 }
@@ -616,7 +558,7 @@ static void print_classify_type_expression(
 {
        print_string("__builtin_classify_type(");
        print_assignment_expression(expr->type_expression);
-       print_string(")");
+       print_char(')');
 }
 
 /**
@@ -628,11 +570,15 @@ static void print_designator(const designator_t *designator)
 {
        for ( ; designator != NULL; designator = designator->next) {
                if (designator->symbol == NULL) {
-                       print_string("[");
+                       print_char('[');
                        print_expression(designator->array_index);
-                       print_string("]");
+                       if (designator->range_last) {
+                               print_string(" ... ");
+                               print_expression(designator->range_last);
+                       }
+                       print_char(']');
                } else {
-                       print_string(".");
+                       print_char('.');
                        print_string(designator->symbol->string);
                }
        }
@@ -647,9 +593,9 @@ static void print_offsetof_expression(const offsetof_expression_t *expression)
 {
        print_string("__builtin_offsetof(");
        print_type(expression->type);
-       print_string(",");
+       print_char(',');
        print_designator(expression->designator);
-       print_string(")");
+       print_char(')');
 }
 
 /**
@@ -659,9 +605,36 @@ static void print_offsetof_expression(const offsetof_expression_t *expression)
  */
 static void print_statement_expression(const statement_expression_t *expression)
 {
-       print_string("(");
+       print_char('(');
        print_statement(expression->statement);
-       print_string(")");
+       print_char(')');
+}
+
+static bool needs_parentheses(expression_t const *const expr, unsigned const top_prec)
+{
+       if (expr->base.parenthesized)
+               return true;
+
+       if (top_prec > get_expression_precedence(expr->base.kind))
+               return true;
+
+       if (print_parenthesis && top_prec != PREC_BOTTOM) {
+               switch (expr->kind) {
+               case EXPR_ENUM_CONSTANT:
+               case EXPR_FUNCNAME:
+               case EXPR_LITERAL_CASES:
+               case EXPR_LITERAL_CHARACTER:
+               case EXPR_REFERENCE:
+               case EXPR_STRING_LITERAL:
+                       /* Do not print () around subexpressions consisting of a single token. */
+                       return false;
+
+               default:
+                       return true;
+               }
+       }
+
+       return false;
 }
 
 /**
@@ -670,100 +643,63 @@ static void print_statement_expression(const statement_expression_t *expression)
  * @param expression  the expression to print
  * @param top_prec    the precedence of the user of this expression.
  */
-static void print_expression_prec(const expression_t *expression, unsigned top_prec)
+static void print_expression_prec(expression_t const *expr, unsigned const top_prec)
 {
-       if (expression->kind == EXPR_UNARY_CAST_IMPLICIT && !print_implicit_casts) {
-               expression = expression->unary.value;
+       if (expr->kind == EXPR_UNARY_CAST && expr->base.implicit && !print_implicit_casts) {
+               expr = expr->unary.value;
        }
 
-       bool parenthesized =
-               expression->base.parenthesized                 ||
-               (print_parenthesis && top_prec != PREC_BOTTOM) ||
-               top_prec > get_expression_precedence(expression->base.kind);
+       bool const parenthesized = needs_parentheses(expr, top_prec);
 
        if (parenthesized)
-               print_string("(");
-       switch (expression->kind) {
-       case EXPR_UNKNOWN:
-       case EXPR_INVALID:
-               print_string("$invalid expression$");
-               break;
-       case EXPR_WIDE_STRING_LITERAL:
-       case EXPR_STRING_LITERAL:
-               print_string_literal(&expression->string_literal);
-               break;
-       EXPR_LITERAL_CASES
-               print_literal(&expression->literal);
-               break;
-       case EXPR_FUNCNAME:
-               print_funcname(&expression->funcname);
-               break;
-       case EXPR_COMPOUND_LITERAL:
-               print_compound_literal(&expression->compound_literal);
-               break;
-       case EXPR_CALL:
-               print_call_expression(&expression->call);
-               break;
-       EXPR_BINARY_CASES
-               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;
-       case EXPR_SIZEOF:
+               print_char('(');
+       switch (expr->kind) {
        case EXPR_ALIGNOF:
-               print_typeprop_expression(&expression->typeprop);
-               break;
-       case EXPR_BUILTIN_CONSTANT_P:
-               print_builtin_constant(&expression->builtin_constant);
-               break;
-       case EXPR_BUILTIN_TYPES_COMPATIBLE_P:
-               print_builtin_types_compatible(&expression->builtin_types_compatible);
-               break;
-       case EXPR_CONDITIONAL:
-               print_conditional(&expression->conditional);
-               break;
-       case EXPR_VA_START:
-               print_va_start(&expression->va_starte);
-               break;
-       case EXPR_VA_ARG:
-               print_va_arg(&expression->va_arge);
-               break;
-       case EXPR_VA_COPY:
-               print_va_copy(&expression->va_copye);
-               break;
-       case EXPR_SELECT:
-               print_select(&expression->select);
-               break;
-       case EXPR_CLASSIFY_TYPE:
-               print_classify_type_expression(&expression->classify_type);
-               break;
-       case EXPR_OFFSETOF:
-               print_offsetof_expression(&expression->offsetofe);
+       case EXPR_SIZEOF:                     print_typeprop_expression(     &expr->typeprop);                 break;
+       case EXPR_ARRAY_ACCESS:               print_array_expression(        &expr->array_access);             break;
+       case EXPR_BINARY_CASES:               print_binary_expression(       &expr->binary);                   break;
+       case EXPR_BUILTIN_CONSTANT_P:         print_builtin_constant(        &expr->builtin_constant);         break;
+       case EXPR_BUILTIN_TYPES_COMPATIBLE_P: print_builtin_types_compatible(&expr->builtin_types_compatible); break;
+       case EXPR_CALL:                       print_call_expression(         &expr->call);                     break;
+       case EXPR_CLASSIFY_TYPE:              print_classify_type_expression(&expr->classify_type);            break;
+       case EXPR_COMPOUND_LITERAL:           print_compound_literal(        &expr->compound_literal);         break;
+       case EXPR_CONDITIONAL:                print_conditional(             &expr->conditional);              break;
+       case EXPR_ERROR:                      print_string("$error$");                                         break;
+       case EXPR_FUNCNAME:                   print_funcname(                &expr->funcname);                 break;
+       case EXPR_LABEL_ADDRESS:              print_label_address_expression(&expr->label_address);            break;
+       case EXPR_LITERAL_CASES:              print_literal(                 &expr->literal);                  break;
+       case EXPR_LITERAL_CHARACTER:          print_string_literal(          &expr->string_literal, '\'');     break;
+       case EXPR_OFFSETOF:                   print_offsetof_expression(     &expr->offsetofe);                break;
+       case EXPR_REFERENCE:
+       case EXPR_ENUM_CONSTANT:              print_reference_expression(    &expr->reference);                break;
+       case EXPR_SELECT:                     print_select(                  &expr->select);                   break;
+       case EXPR_STATEMENT:                  print_statement_expression(    &expr->statement);                break;
+       case EXPR_STRING_LITERAL:             print_string_literal(          &expr->string_literal, '"');      break;
+       case EXPR_UNARY_CASES:                print_unary_expression(        &expr->unary);                    break;
+       case EXPR_VA_ARG:                     print_va_arg(                  &expr->va_arge);                  break;
+       case EXPR_VA_COPY:                    print_va_copy(                 &expr->va_copye);                 break;
+       case EXPR_VA_START:                   print_va_start(                &expr->va_starte);                break;
+       }
+       if (parenthesized)
+               print_char(')');
+}
+
+static void print_indented_statement(statement_t const *const stmt)
+{
+       switch (stmt->kind) {
+       case STATEMENT_LABEL:
                break;
-       case EXPR_STATEMENT:
-               print_statement_expression(&expression->statement);
+
+       case STATEMENT_CASE_LABEL:
+               for (int i = 0; i != case_indent; ++i)
+                       print_char('\t');
                break;
 
-#if 0
        default:
-               /* TODO */
-               print_format("some expression of type %d", (int)expression->kind);
+               print_indent();
                break;
-#endif
        }
-       if (parenthesized)
-               print_string(")");
+       print_statement(stmt);
 }
 
 /**
@@ -776,19 +712,14 @@ static void print_compound_statement(const compound_statement_t *block)
        print_string("{\n");
        ++indent;
 
-       statement_t *statement = block->statements;
-       while (statement != NULL) {
-               if (statement->base.kind == STATEMENT_CASE_LABEL)
-                       --indent;
-               if (statement->kind != STATEMENT_LABEL)
-                       print_indent();
-               print_statement(statement);
-
-               statement = statement->base.next;
+       for (statement_t const *stmt = block->statements; stmt; stmt = stmt->base.next) {
+               print_indented_statement(stmt);
+               print_char('\n');
        }
+
        --indent;
        print_indent();
-       print_string(block->stmt_expr ? "}" : "}\n");
+       print_char('}');
 }
 
 /**
@@ -802,9 +733,9 @@ static void print_return_statement(const return_statement_t *statement)
        if (val != NULL) {
                print_string("return ");
                print_expression(val);
-               print_string(";\n");
+               print_char(';');
        } else {
-               print_string("return;\n");
+               print_string("return;");
        }
 }
 
@@ -816,7 +747,19 @@ static void print_return_statement(const return_statement_t *statement)
 static void print_expression_statement(const expression_statement_t *statement)
 {
        print_expression(statement->expression);
-       print_string(";\n");
+       print_char(';');
+}
+
+/**
+ * Print a computed goto statement.
+ *
+ * @param statement  the computed goto statement
+ */
+static void print_computed_goto_statement(computed_goto_statement_t const *const stmt)
+{
+       print_string("goto *");
+       print_expression(stmt->expression);
+       print_char(';');
 }
 
 /**
@@ -827,13 +770,8 @@ static void print_expression_statement(const expression_statement_t *statement)
 static void print_goto_statement(const goto_statement_t *statement)
 {
        print_string("goto ");
-       if (statement->expression != NULL) {
-               print_string("*");
-               print_expression(statement->expression);
-       } else {
-               print_string(statement->label->base.symbol->string);
-       }
-       print_string(";\n");
+       print_string(statement->label->base.symbol->string);
+       print_char(';');
 }
 
 /**
@@ -844,8 +782,30 @@ static void print_goto_statement(const goto_statement_t *statement)
 static void print_label_statement(const label_statement_t *statement)
 {
        print_format("%s:\n", statement->label->base.symbol->string);
-       print_indent();
-       print_statement(statement->statement);
+       print_indented_statement(statement->statement);
+}
+
+static void print_inner_statement(statement_t const *const stmt)
+{
+       if (stmt->kind == STATEMENT_COMPOUND) {
+               print_char(' ');
+               print_compound_statement(&stmt->compound);
+       } else {
+               print_char('\n');
+               ++indent;
+               print_indented_statement(stmt);
+               --indent;
+       }
+}
+
+static void print_after_inner_statement(statement_t const *const stmt)
+{
+       if (stmt->kind == STATEMENT_COMPOUND) {
+               print_char(' ');
+       } else {
+               print_char('\n');
+               print_indent();
+       }
 }
 
 /**
@@ -857,13 +817,19 @@ static void print_if_statement(const if_statement_t *statement)
 {
        print_string("if (");
        print_expression(statement->condition);
-       print_string(") ");
-       print_statement(statement->true_statement);
-
-       if (statement->false_statement != NULL) {
-               print_indent();
-               print_string("else ");
-               print_statement(statement->false_statement);
+       print_char(')');
+       print_inner_statement(statement->true_statement);
+
+       statement_t const *const f = statement->false_statement;
+       if (f) {
+               print_after_inner_statement(statement->true_statement);
+               print_string("else");
+               if (f->kind == STATEMENT_IF) {
+                       print_char(' ');
+                       print_if_statement(&f->ifs);
+               } else {
+                       print_inner_statement(f);
+               }
        }
 }
 
@@ -874,10 +840,15 @@ static void print_if_statement(const if_statement_t *statement)
  */
 static void print_switch_statement(const switch_statement_t *statement)
 {
+       int const old_case_indent = case_indent;
+       case_indent = indent;
+
        print_string("switch (");
        print_expression(statement->expression);
-       print_string(") ");
-       print_statement(statement->body);
+       print_char(')');
+       print_inner_statement(statement->body);
+
+       case_indent = old_case_indent;
 }
 
 /**
@@ -898,21 +869,14 @@ static void print_case_label(const case_label_statement_t *statement)
                }
                print_string(":\n");
        }
-       ++indent;
-       if (statement->statement != NULL) {
-               if (statement->statement->base.kind == STATEMENT_CASE_LABEL) {
-                       --indent;
-               }
-               print_indent();
-               print_statement(statement->statement);
-       }
+       print_indented_statement(statement->statement);
 }
 
 static void print_typedef(const entity_t *entity)
 {
        print_string("typedef ");
        print_type_ext(entity->typedefe.type, entity->base.symbol, NULL);
-       print_string(";");
+       print_char(';');
 }
 
 /**
@@ -941,7 +905,7 @@ static void print_declaration_statement(
        bool first = true;
        entity_t *entity = statement->declarations_begin;
        if (entity == NULL) {
-               print_string("/* empty declaration statement */\n");
+               print_string("/* empty declaration statement */");
                return;
        }
 
@@ -953,29 +917,16 @@ static void print_declaration_statement(
                        continue;
 
                if (!first) {
+                       print_char('\n');
                        print_indent();
                } else {
                        first = false;
                }
 
                print_entity(entity);
-               print_string("\n");
        }
 }
 
-/**
- * Print a while statement.
- *
- * @param statement   the statement
- */
-static void print_while_statement(const while_statement_t *statement)
-{
-       print_string("while (");
-       print_expression(statement->condition);
-       print_string(") ");
-       print_statement(statement->body);
-}
-
 /**
  * Print a do-while statement.
  *
@@ -983,12 +934,12 @@ static void print_while_statement(const while_statement_t *statement)
  */
 static void print_do_while_statement(const do_while_statement_t *statement)
 {
-       print_string("do ");
-       print_statement(statement->body);
-       print_indent();
+       print_string("do");
+       print_inner_statement(statement->body);
+       print_after_inner_statement(statement->body);
        print_string("while (");
        print_expression(statement->condition);
-       print_string(");\n");
+       print_string(");");
 }
 
 /**
@@ -998,30 +949,35 @@ static void print_do_while_statement(const do_while_statement_t *statement)
  */
 static void print_for_statement(const for_statement_t *statement)
 {
-       print_string("for (");
-       if (statement->initialisation != NULL) {
-               print_expression(statement->initialisation);
-               print_string(";");
-       } else {
-               entity_t const *entity = statement->scope.entities;
-               for (; entity != NULL; entity = entity->base.next) {
-                       if (is_generated_entity(entity))
-                               continue;
-                       /* FIXME display of multiple declarations is wrong */
-                       print_declaration(entity);
+       if (statement->initialisation || statement->scope.entities || !statement->condition || statement->step) {
+               print_string("for (");
+               if (statement->initialisation != NULL) {
+                       print_expression(statement->initialisation);
+                       print_char(';');
+               } else {
+                       entity_t const *entity = statement->scope.entities;
+                       for (; entity != NULL; entity = entity->base.next) {
+                               if (is_generated_entity(entity))
+                                       continue;
+                               /* FIXME display of multiple declarations is wrong */
+                               print_declaration(entity);
+                       }
                }
-       }
-       if (statement->condition != NULL) {
-               print_string(" ");
+               if (statement->condition != NULL) {
+                       print_char(' ');
+                       print_expression(statement->condition);
+               }
+               print_char(';');
+               if (statement->step != NULL) {
+                       print_char(' ');
+                       print_expression(statement->step);
+               }
+       } else {
+               print_string("while (");
                print_expression(statement->condition);
        }
-       print_string(";");
-       if (statement->step != NULL) {
-               print_string(" ");
-               print_expression(statement->step);
-       }
-       print_string(") ");
-       print_statement(statement->body);
+       print_char(')');
+       print_inner_statement(statement->body);
 }
 
 /**
@@ -1029,20 +985,18 @@ static void print_for_statement(const for_statement_t *statement)
  *
  * @param arguments   the arguments
  */
-static void print_asm_arguments(asm_argument_t *arguments)
-{
-       asm_argument_t *argument = arguments;
-       for (; argument != NULL; argument = argument->next) {
-               if (argument != arguments)
-                       print_string(", ");
-
-               if (argument->symbol) {
-                       print_format("[%s] ", argument->symbol->string);
-               }
-               print_quoted_string(&argument->constraints, '"', 1);
+static void print_asm_arguments(asm_argument_t const *const arguments)
+{
+       print_string(" :");
+       separator_t sep = { " ", ", " };
+       for (asm_argument_t const *i = arguments; i; i = i->next) {
+               print_string(sep_next(&sep));
+               if (i->symbol)
+                       print_format("[%s] ", i->symbol->string);
+               print_quoted_string(&i->constraints, '"');
                print_string(" (");
-               print_expression(argument->expression);
-               print_string(")");
+               print_expression(i->expression);
+               print_char(')');
        }
 }
 
@@ -1051,50 +1005,51 @@ static void print_asm_arguments(asm_argument_t *arguments)
  *
  * @param clobbers   the clobbers
  */
-static void print_asm_clobbers(asm_clobber_t *clobbers)
+static void print_asm_clobbers(asm_clobber_t const *const clobbers)
 {
-       asm_clobber_t *clobber = clobbers;
-       for (; clobber != NULL; clobber = clobber->next) {
-               if (clobber != clobbers)
-                       print_string(", ");
+       print_string(" :");
+       separator_t sep = { " ", ", " };
+       for (asm_clobber_t const *i = clobbers; i; i = i->next) {
+               print_string(sep_next(&sep));
+               print_quoted_string(&i->clobber, '"');
+       }
+}
 
-               print_quoted_string(&clobber->clobber, '"', 1);
+static void print_asm_labels(asm_label_t const *const labels)
+{
+       print_string(" :");
+       separator_t sep = { " ", ", " };
+       for (asm_label_t const *i = labels; i; i = i->next) {
+               print_string(sep_next(&sep));
+               print_string(i->label->base.symbol->string);
        }
 }
 
 /**
  * Print an assembler statement.
  *
- * @param statement   the statement
+ * @param stmt   the statement
  */
-static void print_asm_statement(const asm_statement_t *statement)
+static void print_asm_statement(asm_statement_t const *const stmt)
 {
-       print_string("asm ");
-       if (statement->is_volatile) {
-               print_string("volatile ");
-       }
-       print_string("(");
-       print_quoted_string(&statement->asm_text, '"', 1);
-       if (statement->outputs  == NULL &&
-           statement->inputs   == NULL &&
-           statement->clobbers == NULL)
-               goto end_of_print_asm_statement;
-
-       print_string(" : ");
-       print_asm_arguments(statement->outputs);
-       if (statement->inputs == NULL && statement->clobbers == NULL)
-               goto end_of_print_asm_statement;
+       print_string("asm");
+       if (stmt->is_volatile) print_string(" volatile");
+       if (stmt->labels)      print_string(" goto");
+       print_char('(');
+       print_quoted_string(&stmt->asm_text, '"');
 
-       print_string(" : ");
-       print_asm_arguments(statement->inputs);
-       if (statement->clobbers == NULL)
-               goto end_of_print_asm_statement;
+       unsigned const n =
+               stmt->labels   ? 4 :
+               stmt->clobbers ? 3 :
+               stmt->inputs   ? 2 :
+               stmt->outputs  ? 1 :
+               0;
+       if (n >= 1) print_asm_arguments(stmt->outputs);
+       if (n >= 2) print_asm_arguments(stmt->inputs);
+       if (n >= 3) print_asm_clobbers( stmt->clobbers);
+       if (n >= 4) print_asm_labels(   stmt->labels);
 
-       print_string(" : ");
-       print_asm_clobbers(statement->clobbers);
-
-end_of_print_asm_statement:
-       print_string(");\n");
+       print_string(");");
 }
 
 /**
@@ -1104,17 +1059,17 @@ end_of_print_asm_statement:
  */
 static void print_ms_try_statement(const ms_try_statement_t *statement)
 {
-       print_string("__try ");
-       print_statement(statement->try_statement);
-       print_indent();
+       print_string("__try");
+       print_inner_statement(statement->try_statement);
+       print_after_inner_statement(statement->try_statement);
        if (statement->except_expression != NULL) {
                print_string("__except(");
                print_expression(statement->except_expression);
-               print_string(") ");
+               print_char(')');
        } else {
-               print_string("__finally ");
+               print_string("__finally");
        }
-       print_statement(statement->final_statement);
+       print_inner_statement(statement->final_statement);
 }
 
 /**
@@ -1125,7 +1080,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;
-       print_string("__leave;\n");
+       print_string("__leave;");
 }
 
 /**
@@ -1133,66 +1088,28 @@ static void print_leave_statement(const leave_statement_t *statement)
  *
  * @param statement   the statement
  */
-void print_statement(const statement_t *statement)
-{
-       switch (statement->kind) {
-       case STATEMENT_EMPTY:
-               print_string(";\n");
-               break;
-       case STATEMENT_COMPOUND:
-               print_compound_statement(&statement->compound);
-               break;
-       case STATEMENT_RETURN:
-               print_return_statement(&statement->returns);
-               break;
-       case STATEMENT_EXPRESSION:
-               print_expression_statement(&statement->expression);
-               break;
-       case STATEMENT_LABEL:
-               print_label_statement(&statement->label);
-               break;
-       case STATEMENT_GOTO:
-               print_goto_statement(&statement->gotos);
-               break;
-       case STATEMENT_CONTINUE:
-               print_string("continue;\n");
-               break;
-       case STATEMENT_BREAK:
-               print_string("break;\n");
-               break;
-       case STATEMENT_IF:
-               print_if_statement(&statement->ifs);
-               break;
-       case STATEMENT_SWITCH:
-               print_switch_statement(&statement->switchs);
-               break;
-       case STATEMENT_CASE_LABEL:
-               print_case_label(&statement->case_label);
-               break;
-       case STATEMENT_DECLARATION:
-               print_declaration_statement(&statement->declaration);
-               break;
-       case STATEMENT_WHILE:
-               print_while_statement(&statement->whiles);
-               break;
-       case STATEMENT_DO_WHILE:
-               print_do_while_statement(&statement->do_while);
-               break;
-       case STATEMENT_FOR:
-               print_for_statement(&statement->fors);
-               break;
-       case STATEMENT_ASM:
-               print_asm_statement(&statement->asms);
-               break;
-       case STATEMENT_MS_TRY:
-               print_ms_try_statement(&statement->ms_try);
-               break;
-       case STATEMENT_LEAVE:
-               print_leave_statement(&statement->leave);
-               break;
-       case STATEMENT_INVALID:
-               print_string("$invalid statement$\n");
-               break;
+void print_statement(statement_t const *const stmt)
+{
+       switch (stmt->kind) {
+       case STATEMENT_ASM:           print_asm_statement(          &stmt->asms);          break;
+       case STATEMENT_BREAK:         print_string("break;");                              break;
+       case STATEMENT_CASE_LABEL:    print_case_label(             &stmt->case_label);    break;
+       case STATEMENT_COMPOUND:      print_compound_statement(     &stmt->compound);      break;
+       case STATEMENT_COMPUTED_GOTO: print_computed_goto_statement(&stmt->computed_goto); break;
+       case STATEMENT_CONTINUE:      print_string("continue;");                           break;
+       case STATEMENT_DECLARATION:   print_declaration_statement(  &stmt->declaration);   break;
+       case STATEMENT_DO_WHILE:      print_do_while_statement(     &stmt->do_while);      break;
+       case STATEMENT_EMPTY:         print_char(';');                                     break;
+       case STATEMENT_ERROR:         print_string("$error statement$");                   break;
+       case STATEMENT_EXPRESSION:    print_expression_statement(   &stmt->expression);    break;
+       case STATEMENT_FOR:           print_for_statement(          &stmt->fors);          break;
+       case STATEMENT_GOTO:          print_goto_statement(         &stmt->gotos);         break;
+       case STATEMENT_IF:            print_if_statement(           &stmt->ifs);           break;
+       case STATEMENT_LABEL:         print_label_statement(        &stmt->label);         break;
+       case STATEMENT_LEAVE:         print_leave_statement(        &stmt->leave);         break;
+       case STATEMENT_MS_TRY:        print_ms_try_statement(       &stmt->ms_try);        break;
+       case STATEMENT_RETURN:        print_return_statement(       &stmt->returns);       break;
+       case STATEMENT_SWITCH:        print_switch_statement(       &stmt->switchs);       break;
        }
 }
 
@@ -1227,13 +1144,12 @@ void print_initializer(const initializer_t *initializer)
        }
 
        switch (initializer->kind) {
-       case INITIALIZER_VALUE: {
-               const initializer_value_t *value = &initializer->value;
-               print_assignment_expression(value->value);
+       case INITIALIZER_STRING:
+       case INITIALIZER_VALUE:
+               print_assignment_expression(initializer->value.value);
                return;
-       }
+
        case INITIALIZER_LIST: {
-               assert(initializer->kind == INITIALIZER_LIST);
                print_string("{ ");
                const initializer_list_t *list = &initializer->list;
 
@@ -1248,12 +1164,7 @@ void print_initializer(const initializer_t *initializer)
                print_string(" }");
                return;
        }
-       case INITIALIZER_STRING:
-               print_quoted_string(&initializer->string.string, '"', 1);
-               return;
-       case INITIALIZER_WIDE_STRING:
-               print_quoted_string(&initializer->string.string, '"', 1);
-               return;
+
        case INITIALIZER_DESIGNATOR:
                print_designator(initializer->designator.designator);
                print_string(" = ");
@@ -1274,85 +1185,75 @@ static void print_ms_modifiers(const declaration_t *declaration)
 
        decl_modifiers_t modifiers = declaration->modifiers;
 
-       bool        ds_shown = false;
-       const char *next     = "(";
+       separator_t sep = { "__declspec(", ", " };
 
        if (declaration->base.kind == ENTITY_VARIABLE) {
                variable_t *variable = (variable_t*)declaration;
                if (variable->alignment != 0
                                || variable->get_property_sym != NULL
                                || variable->put_property_sym != NULL) {
-                       if (!ds_shown) {
-                               print_string("__declspec");
-                               ds_shown = true;
-                       }
-
                        if (variable->alignment != 0) {
-                               print_string(next); next = ", "; print_format("align(%u)", variable->alignment);
+                               print_format("%salign(%u)", sep_next(&sep), variable->alignment);
                        }
                        if (variable->get_property_sym != NULL
                                        || variable->put_property_sym != NULL) {
                                char *comma = "";
-                               print_string(next); next = ", "; print_string("property(");
+                               print_format("%sproperty(", sep_next(&sep));
                                if (variable->get_property_sym != NULL) {
                                        print_format("get=%s", variable->get_property_sym->string);
                                        comma = ", ";
                                }
                                if (variable->put_property_sym != NULL)
                                        print_format("%sput=%s", comma, variable->put_property_sym->string);
-                               print_string(")");
+                               print_char(')');
                        }
                }
        }
 
        /* DM_FORCEINLINE handled outside. */
        if ((modifiers & ~DM_FORCEINLINE) != 0) {
-               if (!ds_shown) {
-                       print_string("__declspec");
-                       ds_shown = true;
-               }
                if (modifiers & DM_DLLIMPORT) {
-                       print_string(next); next = ", "; print_string("dllimport");
+                       print_format("%sdllimport", sep_next(&sep));
                }
                if (modifiers & DM_DLLEXPORT) {
-                       print_string(next); next = ", "; print_string("dllexport");
+                       print_format("%sdllexport", sep_next(&sep));
                }
                if (modifiers & DM_THREAD) {
-                       print_string(next); next = ", "; print_string("thread");
+                       print_format("%sthread", sep_next(&sep));
                }
                if (modifiers & DM_NAKED) {
-                       print_string(next); next = ", "; print_string("naked");
+                       print_format("%snaked", sep_next(&sep));
                }
                if (modifiers & DM_THREAD) {
-                       print_string(next); next = ", "; print_string("thread");
+                       print_format("%sthread", sep_next(&sep));
                }
                if (modifiers & DM_SELECTANY) {
-                       print_string(next); next = ", "; print_string("selectany");
+                       print_format("%sselectany", sep_next(&sep));
                }
                if (modifiers & DM_NOTHROW) {
-                       print_string(next); next = ", "; print_string("nothrow");
+                       print_format("%snothrow", sep_next(&sep));
                }
                if (modifiers & DM_NORETURN) {
-                       print_string(next); next = ", "; print_string("noreturn");
+                       print_format("%snoreturn", sep_next(&sep));
                }
                if (modifiers & DM_NOINLINE) {
-                       print_string(next); next = ", "; print_string("noinline");
+                       print_format("%snoinline", sep_next(&sep));
                }
                if (modifiers & DM_DEPRECATED) {
-                       print_string(next); next = ", "; print_string("deprecated");
+                       print_format("%sdeprecated", sep_next(&sep));
                        if (declaration->deprecated_string != NULL)
                                print_format("(\"%s\")",
                                        declaration->deprecated_string);
                }
                if (modifiers & DM_RESTRICT) {
-                       print_string(next); next = ", "; print_string("restrict");
+                       print_format("%srestrict", sep_next(&sep));
                }
                if (modifiers & DM_NOALIAS) {
-                       print_string(next); next = ", "; print_string("noalias");
+                       print_format("%snoalias", sep_next(&sep));
                }
        }
 
-       if (ds_shown)
+       if (!sep_at_first(&sep))
                print_string(") ");
 }
 #endif
@@ -1363,7 +1264,7 @@ static void print_scope(const scope_t *scope)
        for ( ; entity != NULL; entity = entity->base.next) {
                print_indent();
                print_entity(entity);
-               print_string("\n");
+               print_char('\n');
        }
 }
 
@@ -1372,7 +1273,7 @@ static void print_namespace(const namespace_t *namespace)
        print_string("namespace ");
        if (namespace->base.symbol != NULL) {
                print_string(namespace->base.symbol->string);
-               print_string(" ");
+               print_char(' ');
        }
 
        print_string("{\n");
@@ -1412,17 +1313,17 @@ void print_declaration(const entity_t *entity)
                        print_type_ext(entity->declaration.type, entity->base.symbol,
                                        &entity->function.parameters);
 
-                       if (entity->function.statement != NULL) {
-                               print_string("\n");
-                               print_indent();
-                               print_statement(entity->function.statement);
+                       if (entity->function.body != NULL) {
+                               print_char('\n');
+                               print_indented_statement(entity->function.body);
+                               print_char('\n');
                                return;
                        }
                        break;
 
                case ENTITY_VARIABLE:
                        if (entity->variable.thread_local)
-                               print_string("__thread ");
+                               print_string(c_mode & _C11 ? "_Thread_local " : "__thread ");
                        print_type_ext(declaration->type, declaration->base.symbol, NULL);
                        if (entity->variable.initializer != NULL) {
                                print_string(" = ");
@@ -1430,11 +1331,18 @@ void print_declaration(const entity_t *entity)
                        }
                        break;
 
+               case ENTITY_COMPOUND_MEMBER:
+                       print_type_ext(declaration->type, declaration->base.symbol, NULL);
+                       if (entity->compound_member.bitfield) {
+                               print_format(" : %u", entity->compound_member.bit_size);
+                       }
+                       break;
+
                default:
                        print_type_ext(declaration->type, declaration->base.symbol, NULL);
                        break;
        }
-       print_string(";");
+       print_char(';');
 }
 
 /**
@@ -1481,17 +1389,17 @@ void print_entity(const entity_t *entity)
 print_compound:
                print_string(entity->base.symbol->string);
                if (entity->compound.complete) {
-                       print_string(" ");
+                       print_char(' ');
                        print_compound_definition(&entity->compound);
                }
-               print_string(";");
+               print_char(';');
                return;
        case ENTITY_ENUM:
                print_string("enum ");
                print_string(entity->base.symbol->string);
-               print_string(" ");
+               print_char(' ');
                print_enum_definition(&entity->enume);
-               print_string(";");
+               print_char(';');
                return;
        case ENTITY_NAMESPACE:
                print_namespace(&entity->namespacee);
@@ -1499,13 +1407,11 @@ print_compound:
        case ENTITY_LOCAL_LABEL:
                print_string("__label__ ");
                print_string(entity->base.symbol->string);
-               print_string(";");
+               print_char(';');
                return;
        case ENTITY_LABEL:
        case ENTITY_ENUM_VALUE:
                panic("print_entity used on unexpected entity type");
-       case ENTITY_INVALID:
-               break;
        }
        panic("Invalid entity type encountered");
 }
@@ -1529,7 +1435,7 @@ void print_ast(const translation_unit_t *unit)
 
                print_indent();
                print_entity(entity);
-               print_string("\n");
+               print_char('\n');
        }
 }
 
@@ -1537,21 +1443,18 @@ expression_classification_t is_constant_initializer(const initializer_t *initial
 {
        switch (initializer->kind) {
        case INITIALIZER_STRING:
-       case INITIALIZER_WIDE_STRING:
        case INITIALIZER_DESIGNATOR:
                return EXPR_CLASS_CONSTANT;
 
        case INITIALIZER_VALUE:
-               return is_constant_expression(initializer->value.value);
+               return is_linker_constant(initializer->value.value);
 
        case INITIALIZER_LIST: {
                expression_classification_t all = EXPR_CLASS_CONSTANT;
                for (size_t i = 0; i < initializer->list.len; ++i) {
                        initializer_t *sub_initializer = initializer->list.initializers[i];
                        expression_classification_t const cur = is_constant_initializer(sub_initializer);
-                       if (all > cur) {
-                               all = cur;
-                       }
+                       all = MIN(all, cur);
                }
                return all;
        }
@@ -1559,50 +1462,67 @@ expression_classification_t is_constant_initializer(const initializer_t *initial
        panic("invalid initializer kind found");
 }
 
-static expression_classification_t is_object_with_linker_constant_address(const expression_t *expression)
+/**
+ * Checks if an expression references an object with a constant/known location
+ * to the linker. Example:
+ *  - "x", "*&x" with x being a global variable. The value of x need not be
+ *         constant but the address of x is.
+ *  - "a.b.c" when a has a constant/known location to the linker
+ */
+static expression_classification_t is_object_with_linker_constant_address(
+       const expression_t *expression)
 {
        switch (expression->kind) {
        case EXPR_UNARY_DEREFERENCE:
-               return is_address_constant(expression->unary.value);
+               return is_linker_constant(expression->unary.value);
+
+       case EXPR_COMPOUND_LITERAL: {
+               const compound_literal_expression_t *literal
+                       = &expression->compound_literal;
+               return literal->global_scope ||
+                      ((literal->type->base.qualifiers & TYPE_QUALIFIER_CONST)
+                       && is_constant_initializer(literal->initializer));
+       }
 
        case EXPR_SELECT: {
                type_t *base_type = skip_typeref(expression->select.compound->base.type);
                if (is_type_pointer(base_type)) {
                        /* it's a -> */
-                       return is_address_constant(expression->select.compound);
+                       return is_linker_constant(expression->select.compound);
                } else {
                        return is_object_with_linker_constant_address(expression->select.compound);
                }
        }
 
        case EXPR_ARRAY_ACCESS: {
-               expression_classification_t const ref = is_address_constant(expression->array_access.array_ref);
+               expression_classification_t const ref = is_linker_constant(expression->array_access.array_ref);
                expression_classification_t const idx = is_constant_expression(expression->array_access.index);
-               return ref < idx ? ref : idx;
+               return MIN(ref, idx);
        }
 
        case EXPR_REFERENCE: {
                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 ? EXPR_CLASS_CONSTANT :
-                                       EXPR_CLASS_VARIABLE;
-
-                       case STORAGE_CLASS_REGISTER:
-                       case STORAGE_CLASS_TYPEDEF:
-                       case STORAGE_CLASS_AUTO:
-                               break;
-                       }
+               if (!is_declaration(entity))
+                       return EXPR_CLASS_VARIABLE;
+
+               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 ? EXPR_CLASS_CONSTANT :
+                               EXPR_CLASS_VARIABLE;
+
+               case STORAGE_CLASS_REGISTER:
+               case STORAGE_CLASS_TYPEDEF:
+               case STORAGE_CLASS_AUTO:
+                       break;
                }
                return EXPR_CLASS_VARIABLE;
        }
 
-       case EXPR_INVALID:
+       case EXPR_ERROR:
                return EXPR_CLASS_ERROR;
 
        default:
@@ -1610,15 +1530,17 @@ static expression_classification_t is_object_with_linker_constant_address(const
        }
 }
 
-expression_classification_t is_address_constant(const expression_t *expression)
+expression_classification_t is_linker_constant(const expression_t *expression)
 {
        switch (expression->kind) {
        case EXPR_STRING_LITERAL:
-       case EXPR_WIDE_STRING_LITERAL:
        case EXPR_FUNCNAME:
        case EXPR_LABEL_ADDRESS:
                return EXPR_CLASS_CONSTANT;
 
+       case EXPR_COMPOUND_LITERAL:
+               return is_constant_initializer(expression->compound_literal.initializer);
+
        case EXPR_UNARY_TAKE_ADDRESS:
                return is_object_with_linker_constant_address(expression->unary.value);
 
@@ -1627,7 +1549,7 @@ expression_classification_t is_address_constant(const expression_t *expression)
                        = revert_automatic_type_conversion(expression->unary.value);
                /* dereferencing a function is a NOP */
                if (is_type_function(real_type)) {
-                       return is_address_constant(expression->unary.value);
+                       return is_linker_constant(expression->unary.value);
                }
                /* FALLTHROUGH */
        }
@@ -1637,13 +1559,11 @@ expression_classification_t 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_type_size(type_void_ptr)
                    ))
-                       return EXPR_CLASS_VARIABLE;
+                       return is_constant_expression(expression);
 
-               expression_classification_t const expr = is_constant_expression(expression->unary.value);
-               expression_classification_t const addr = is_address_constant(expression->unary.value);
-               return expr > addr ? expr : addr;
+               return is_linker_constant(expression->unary.value);
        }
 
        case EXPR_BINARY_ADD:
@@ -1654,17 +1574,17 @@ expression_classification_t is_address_constant(const expression_t *expression)
                type_t       *const rtype = skip_typeref(right->base.type);
 
                if (is_type_pointer(ltype)) {
-                       expression_classification_t const l = is_address_constant(left);
+                       expression_classification_t const l = is_linker_constant(left);
                        expression_classification_t const r = is_constant_expression(right);
-                       return l < r ? l : r;
+                       return MIN(l, r);
                } else if (is_type_pointer(rtype)) {
                        expression_classification_t const l = is_constant_expression(left);
-                       expression_classification_t const r = is_address_constant(right);
-                       return l < r ? l : r;
+                       expression_classification_t const r = is_linker_constant(right);
+                       return MIN(l, r);
                } else if (!is_type_valid(ltype) || !is_type_valid(rtype)) {
                        return EXPR_CLASS_ERROR;
                } else {
-                       return EXPR_CLASS_VARIABLE;
+                       return is_constant_expression(expression);
                }
        }
 
@@ -1690,30 +1610,44 @@ expression_classification_t is_address_constant(const expression_t *expression)
                        skip_typeref(revert_automatic_type_conversion(expression));
                if (!is_type_array(type))
                        return EXPR_CLASS_VARIABLE;
-               expression_classification_t const ref = is_address_constant(expression->array_access.array_ref);
-               expression_classification_t const idx = is_constant_expression(expression->array_access.index);
-               return ref < idx ? ref : idx;
+               return is_linker_constant(expression->array_access.array_ref);
        }
 
        case EXPR_CONDITIONAL: {
                expression_t *const c = expression->conditional.condition;
                expression_classification_t const cclass = is_constant_expression(c);
-               if (cclass != EXPR_CLASS_CONSTANT)
+               if (cclass < EXPR_CLASS_CONSTANT)
                        return cclass;
 
                if (fold_constant_to_bool(c)) {
                        expression_t const *const t = expression->conditional.true_expression;
-                       return is_address_constant(t != NULL ? t : c);
+                       return is_linker_constant(t != NULL ? t : c);
                } else {
-                       return is_address_constant(expression->conditional.false_expression);
+                       return is_linker_constant(expression->conditional.false_expression);
                }
        }
 
-       case EXPR_INVALID:
-               return EXPR_CLASS_ERROR;
+       case EXPR_SELECT: {
+               entity_t *entity = expression->select.compound_entry;
+               if (!is_declaration(entity))
+                       return EXPR_CLASS_VARIABLE;
+               type_t *type = skip_typeref(entity->declaration.type);
+               if (is_type_array(type)) {
+                       /* arrays automatically convert to their address */
+                       expression_t *compound  = expression->select.compound;
+                       type_t       *base_type = skip_typeref(compound->base.type);
+                       if (is_type_pointer(base_type)) {
+                               /* it's a -> */
+                               return is_linker_constant(compound);
+                       } else {
+                               return is_object_with_linker_constant_address(compound);
+                       }
+               }
+               return EXPR_CLASS_VARIABLE;
+       }
 
        default:
-               return EXPR_CLASS_VARIABLE;
+               return is_constant_expression(expression);
        }
 }
 
@@ -1731,15 +1665,8 @@ static expression_classification_t is_builtin_const_call(const expression_t *exp
                return EXPR_CLASS_VARIABLE;
 
        switch (ref->entity->function.btk) {
-       case bk_gnu_builtin_huge_val:
-       case bk_gnu_builtin_huge_valf:
-       case bk_gnu_builtin_huge_vall:
-       case bk_gnu_builtin_inf:
-       case bk_gnu_builtin_inff:
-       case bk_gnu_builtin_infl:
-       case bk_gnu_builtin_nan:
-       case bk_gnu_builtin_nanf:
-       case bk_gnu_builtin_nanl:
+       case BUILTIN_INF:
+       case BUILTIN_NAN:
                return EXPR_CLASS_CONSTANT;
        default:
                return EXPR_CLASS_VARIABLE;
@@ -1779,17 +1706,17 @@ static expression_classification_t is_object_with_constant_address(const express
                array_access_expression_t const* const array_access =
                        &expression->array_access;
                expression_classification_t const idx_class = is_constant_expression(array_access->index);
-               if (idx_class != EXPR_CLASS_CONSTANT)
+               if (idx_class < EXPR_CLASS_CONSTANT)
                        return idx_class;
                expression_classification_t const ref_addr = is_object_with_constant_address(array_access->array_ref);
                expression_classification_t const ref_ptr  = is_constant_pointer(array_access->array_ref);
-               return ref_addr > ref_ptr ? ref_addr : ref_ptr;
+               return MAX(ref_addr, ref_ptr);
        }
 
        case EXPR_UNARY_DEREFERENCE:
                return is_constant_pointer(expression->unary.value);
 
-       case EXPR_INVALID:
+       case EXPR_ERROR:
                return EXPR_CLASS_ERROR;
 
        default:
@@ -1800,24 +1727,52 @@ static expression_classification_t is_object_with_constant_address(const express
 expression_classification_t is_constant_expression(const expression_t *expression)
 {
        switch (expression->kind) {
-       EXPR_LITERAL_CASES
+       case EXPR_LITERAL_CHARACTER:
+       case EXPR_BUILTIN_TYPES_COMPATIBLE_P:
+       case EXPR_ENUM_CONSTANT:
+       case EXPR_LITERAL_BOOLEAN:
+       case EXPR_LITERAL_MS_NOOP:
+               return EXPR_CLASS_INTEGER_CONSTANT;
+
+       {
+               type_t *type;
+       case EXPR_ALIGNOF:
+               type = skip_typeref(expression->typeprop.type);
+               goto check_type;
+
        case EXPR_CLASSIFY_TYPE:
+               type = skip_typeref(expression->classify_type.type_expression->base.type);
+               goto check_type;
+
+       case EXPR_LITERAL_INTEGER:
+               type = skip_typeref(expression->base.type);
+               goto check_type;
+
        case EXPR_OFFSETOF:
-       case EXPR_ALIGNOF:
-       case EXPR_BUILTIN_CONSTANT_P:
-       case EXPR_BUILTIN_TYPES_COMPATIBLE_P:
-       case EXPR_REFERENCE_ENUM_VALUE:
-               return EXPR_CLASS_CONSTANT;
+               type = skip_typeref(expression->offsetofe.type);
+               goto check_type;
+
+       case EXPR_SIZEOF:
+               type = skip_typeref(expression->typeprop.type);
+               if (is_type_array(type) && type->array.is_vla)
+                       return EXPR_CLASS_VARIABLE;
+               goto check_type;
+
+check_type:
+               return is_type_valid(type) ? EXPR_CLASS_INTEGER_CONSTANT : EXPR_CLASS_ERROR;
+       }
+
+       case EXPR_LITERAL_FLOATINGPOINT: {
+               type_t *const type = skip_typeref(expression->base.type);
+               return is_type_valid(type) ? EXPR_CLASS_CONSTANT : EXPR_CLASS_ERROR;
+       }
 
-       case EXPR_SIZEOF: {
-               type_t *const type = skip_typeref(expression->typeprop.type);
-               return
-                       !is_type_array(type) || !type->array.is_vla ? EXPR_CLASS_CONSTANT :
-                       EXPR_CLASS_VARIABLE;
+       case EXPR_BUILTIN_CONSTANT_P: {
+               expression_classification_t const c = is_constant_expression(expression->builtin_constant.value);
+               return c != EXPR_CLASS_ERROR ? EXPR_CLASS_INTEGER_CONSTANT : EXPR_CLASS_ERROR;
        }
 
        case EXPR_STRING_LITERAL:
-       case EXPR_WIDE_STRING_LITERAL:
        case EXPR_FUNCNAME:
        case EXPR_LABEL_ADDRESS:
        case EXPR_SELECT:
@@ -1862,13 +1817,28 @@ expression_classification_t is_constant_expression(const expression_t *expressio
 
        case EXPR_UNARY_NEGATE:
        case EXPR_UNARY_PLUS:
-       case EXPR_UNARY_BITWISE_NEGATE:
+       case EXPR_UNARY_COMPLEMENT:
        case EXPR_UNARY_NOT:
                return is_constant_expression(expression->unary.value);
 
-       case EXPR_UNARY_CAST:
-       case EXPR_UNARY_CAST_IMPLICIT: {
+       case EXPR_UNARY_IMAG:
+       case EXPR_UNARY_REAL: {
+               type_t *type = skip_typeref(expression->base.type);
+               if (!is_type_valid(type))
+                       return EXPR_CLASS_ERROR;
+               return is_constant_expression(expression->unary.value);
+       }
+
+       case EXPR_UNARY_CAST: {
                type_t *const type = skip_typeref(expression->base.type);
+               if (is_type_integer(type)) {
+                       expression_t *const val = expression->unary.value;
+                       if (is_type_arithmetic(skip_typeref(val->base.type))) {
+                               return val->kind == EXPR_LITERAL_FLOATINGPOINT
+                                       ? EXPR_CLASS_INTEGER_CONSTANT
+                                       : is_constant_expression(val);
+                       }
+               }
                if (is_type_scalar(type))
                        return is_constant_expression(expression->unary.value);
                if (!is_type_valid(type))
@@ -1900,53 +1870,58 @@ expression_classification_t is_constant_expression(const expression_t *expressio
        case EXPR_BINARY_ISUNORDERED: {
                expression_classification_t const l = is_constant_expression(expression->binary.left);
                expression_classification_t const r = is_constant_expression(expression->binary.right);
-               return l < r ? l : r;
+               return MIN(l, r);
        }
 
        case EXPR_BINARY_LOGICAL_AND: {
-               expression_t const         *const left   = expression->binary.left;
-               expression_classification_t const lclass = is_constant_expression(left);
-               if (lclass != EXPR_CLASS_CONSTANT)
-                       return lclass;
+               expression_t const         *const left = expression->binary.left;
+               expression_classification_t const lcls = is_constant_expression(left);
+               if (lcls < EXPR_CLASS_CONSTANT)
+                       return lcls;
+               expression_classification_t const rcls = is_constant_expression(expression->binary.right);
+               if (lcls == EXPR_CLASS_INTEGER_CONSTANT && rcls == EXPR_CLASS_INTEGER_CONSTANT)
+                       return EXPR_CLASS_INTEGER_CONSTANT;
                if (!fold_constant_to_bool(left))
                        return EXPR_CLASS_CONSTANT;
-               return is_constant_expression(expression->binary.right);
+               return MIN(rcls, EXPR_CLASS_CONSTANT);
        }
 
        case EXPR_BINARY_LOGICAL_OR: {
-               expression_t const         *const left   = expression->binary.left;
-               expression_classification_t const lclass = is_constant_expression(left);
-               if (lclass != EXPR_CLASS_CONSTANT)
-                       return lclass;
+               expression_t const         *const left = expression->binary.left;
+               expression_classification_t const lcls = is_constant_expression(left);
+               if (lcls < EXPR_CLASS_CONSTANT)
+                       return lcls;
+               expression_classification_t const rcls = is_constant_expression(expression->binary.right);
+               if (lcls == EXPR_CLASS_INTEGER_CONSTANT && rcls == EXPR_CLASS_INTEGER_CONSTANT)
+                       return EXPR_CLASS_INTEGER_CONSTANT;
                if (fold_constant_to_bool(left))
                        return EXPR_CLASS_CONSTANT;
-               return is_constant_expression(expression->binary.right);
+               return MIN(rcls, EXPR_CLASS_CONSTANT);
        }
 
        case EXPR_COMPOUND_LITERAL:
                return is_constant_initializer(expression->compound_literal.initializer);
 
        case EXPR_CONDITIONAL: {
-               expression_t               *const condition = expression->conditional.condition;
-               expression_classification_t const cclass    = is_constant_expression(condition);
-               if (cclass != EXPR_CLASS_CONSTANT)
-                       return cclass;
-
-               if (fold_constant_to_bool(condition)) {
-                       expression_t const *const t = expression->conditional.true_expression;
-                       return t == NULL ? EXPR_CLASS_CONSTANT : is_constant_expression(t);
-               } else {
-                       return is_constant_expression(expression->conditional.false_expression);
-               }
-       }
-
-       case EXPR_INVALID:
+               expression_t               *const cond = expression->conditional.condition;
+               expression_classification_t const ccls = is_constant_expression(cond);
+               if (ccls < EXPR_CLASS_CONSTANT)
+                       return ccls;
+               expression_t         const *const t    = expression->conditional.true_expression;
+               expression_classification_t const tcls = t == NULL ? ccls : is_constant_expression(t);
+               expression_classification_t const fcls = is_constant_expression(expression->conditional.false_expression);
+               if (ccls == EXPR_CLASS_INTEGER_CONSTANT &&
+                   tcls == EXPR_CLASS_INTEGER_CONSTANT &&
+                   fcls == EXPR_CLASS_INTEGER_CONSTANT)
+                       return EXPR_CLASS_INTEGER_CONSTANT;
+               expression_classification_t const cls = fold_constant_to_bool(cond) ? tcls : fcls;
+               return MIN(cls, EXPR_CLASS_CONSTANT);
+       }
+
+       case EXPR_ERROR:
                return EXPR_CLASS_ERROR;
-
-       case EXPR_UNKNOWN:
-               break;
        }
-       panic("invalid expression found (is constant expression)");
+       panic("invalid expression");
 }
 
 void init_ast(void)