Pretend the error type is compatible with every type, to suppress stray errors. ...
[cparser] / ast.c
diff --git a/ast.c b/ast.c
index 1ee1e14..060aa6c 100644 (file)
--- a/ast.c
+++ b/ast.c
 #include <config.h>
 
 #include "ast_t.h"
+#include "symbol_t.h"
 #include "type_t.h"
+#include "parser.h"
+#include "lang_features.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;
@@ -51,29 +60,30 @@ void change_indent(int delta)
 
 void print_indent(void)
 {
-       for(int i = 0; i < indent; ++i)
-               fprintf(out, "\t");
+       for (int i = 0; i < indent; ++i)
+               fputc('\t', out);
 }
 
 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
+       PREC_EXPR    =  2,
+       PREC_COMMA   =  4, /* ,                                    left to right */
+       PREC_ASSIGN  =  6, /* = += -= *= /= %= <<= >>= &= ^= |=    right to left */
+       PREC_COND    =  8, /* ?:                                   right to left */
+       PREC_LOG_OR  = 10, /* ||                                   left to right */
+       PREC_LOG_AND = 12, /* &&                                   left to right */
+       PREC_BIT_OR  = 14, /* |                                    left to right */
+       PREC_BIT_XOR = 16, /* ^                                    left to right */
+       PREC_BIT_AND = 18, /* &                                    left to right */
+       PREC_EQ      = 20, /* == !=                                left to right */
+       PREC_CMP     = 22, /* < <= > >=                            left to right */
+       PREC_SHF     = 24, /* << >>                                left to right */
+       PREC_PLUS    = 26, /* + -                                  left to right */
+       PREC_MUL     = 28, /* * / %                                left to right */
+       PREC_UNARY   = 30, /* ! ~ ++ -- + - (type) * & sizeof      right to left */
+       PREC_ACCESS  = 32, /* () [] -> .                           left to right */
+       PREC_PRIM    = 34, /* primary */
+       PREC_TOP     = 36
 };
 
 /**
@@ -98,12 +108,13 @@ static unsigned get_expression_precedence(expression_kind_t kind)
                [EXPR_UNKNOWN]                   = PREC_PRIM,
                [EXPR_INVALID]                   = PREC_PRIM,
                [EXPR_REFERENCE]                 = PREC_PRIM,
-               [EXPR_CHAR_CONST]                = 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_COMPOUND_LITERAL]          = PREC_UNARY,
-               [EXPR_CALL]                      = PREC_PRIM,
+               [EXPR_CALL]                      = PREC_ACCESS,
                [EXPR_CONDITIONAL]               = PREC_COND,
                [EXPR_SELECT]                    = PREC_ACCESS,
                [EXPR_ARRAY_ACCESS]              = PREC_ACCESS,
@@ -111,8 +122,7 @@ static unsigned get_expression_precedence(expression_kind_t kind)
                [EXPR_CLASSIFY_TYPE]             = PREC_UNARY,
                [EXPR_ALIGNOF]                   = PREC_UNARY,
 
-               [EXPR_FUNCTION]                  = PREC_PRIM,
-               [EXPR_PRETTY_FUNCTION]           = PREC_PRIM,
+               [EXPR_FUNCNAME]                  = PREC_PRIM,
                [EXPR_BUILTIN_SYMBOL]            = PREC_PRIM,
                [EXPR_BUILTIN_CONSTANT_P]        = PREC_PRIM,
                [EXPR_BUILTIN_PREFETCH]          = PREC_PRIM,
@@ -120,6 +130,7 @@ static unsigned get_expression_precedence(expression_kind_t kind)
                [EXPR_VA_START]                  = PREC_PRIM,
                [EXPR_VA_ARG]                    = PREC_PRIM,
                [EXPR_STATEMENT]                 = PREC_ACCESS,
+               [EXPR_LABEL_ADDRESS]             = PREC_PRIM,
 
                [EXPR_UNARY_NEGATE]              = PREC_UNARY,
                [EXPR_UNARY_PLUS]                = PREC_UNARY,
@@ -134,7 +145,6 @@ static unsigned get_expression_precedence(expression_kind_t kind)
                [EXPR_UNARY_CAST]                = PREC_UNARY,
                [EXPR_UNARY_CAST_IMPLICIT]       = PREC_UNARY,
                [EXPR_UNARY_ASSUME]              = PREC_PRIM,
-               [EXPR_UNARY_BITFIELD_EXTRACT]    = PREC_ACCESS,
 
                [EXPR_BINARY_ADD]                = PREC_PLUS,
                [EXPR_BINARY_SUB]                = PREC_PLUS,
@@ -197,10 +207,33 @@ static void print_const(const const_expression_t *cnst)
        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: suffix = NULL; break;
+       }
+       if (suffix != NULL)
+               fputs(suffix, out);
 }
 
 /**
@@ -208,11 +241,12 @@ 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);
@@ -227,6 +261,11 @@ 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);
@@ -239,37 +278,20 @@ static void print_quoted_string(const string_t *const string, char border)
        fputc(border, out);
 }
 
-/**
- * Print a constant character expression.
- *
- * @param cnst  the constant character expression
- */
-static void print_char_const(const const_expression_t *cnst)
-{
-       print_quoted_string(&cnst->v.chars, '\'');
-}
-
-/**
- * Prints a string literal expression.
- *
- * @param string_literal  the string literal expression
- */
-static void print_string_literal(
-               const string_literal_expression_t *string_literal)
-{
-       print_quoted_string(&string_literal->value, '"');
-}
-
 /**
  * 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)
+static void print_quoted_wide_string(const wide_string_t *const wstr,
+                                     char border, int skip)
 {
-       fputs("L\"", out);
-       for (const wchar_rep_t *c = wstr->begin, *end = wstr->begin + wstr->size - 1;
-            c != end; ++c) {
+       fputc('L', out);
+       fputc(border, out);
+       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;
@@ -281,6 +303,11 @@ 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) {
@@ -305,13 +332,57 @@ static void print_quoted_wide_string(const wide_string_t *const wstr)
                        }
                }
        }
+       fputc(border, out);
+}
+
+/**
+ * Print a constant character expression.
+ *
+ * @param cnst  the constant character expression
+ */
+static void print_character_constant(const const_expression_t *cnst)
+{
+       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, '\'', 0);
+}
+
+/**
+ * Prints a string literal expression.
+ *
+ * @param string_literal  the string literal expression
+ */
+static void print_string_literal(
+               const string_literal_expression_t *string_literal)
+{
+       print_quoted_string(&string_literal->value, '"', 1);
+}
+
+/**
+ * Prints a predefined symbol.
+ */
+static void print_funcname(
+               const funcname_expression_t *funcname)
+{
+       const char *s = "";
+       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(
@@ -332,12 +403,12 @@ 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, ", ");
+                       fputs(", ", out);
                } else {
                        first = 0;
                }
@@ -345,7 +416,7 @@ static void print_call_expression(const call_expression_t *call)
 
                argument = argument->next;
        }
-       fprintf(out, ")");
+       fputc(')', out);
 }
 
 /**
@@ -418,18 +489,14 @@ 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_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:      fputs("*", out);  break;
-       case EXPR_UNARY_TAKE_ADDRESS:     fputs("&", out);  break;
-
-       case EXPR_UNARY_BITFIELD_EXTRACT:
-               print_expression_prec(unexpr->value, prec);
-               return;
+       case EXPR_UNARY_DEREFERENCE:      fputc('*', out);  break;
+       case EXPR_UNARY_TAKE_ADDRESS:     fputc('&', out);  break;
 
        case EXPR_UNARY_POSTFIX_INCREMENT:
                print_expression_prec(unexpr->value, prec);
@@ -440,11 +507,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);
@@ -468,7 +530,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->declaration->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->declaration->symbol->string);
 }
 
 /**
@@ -482,12 +554,12 @@ static void print_array_expression(const array_access_expression_t *expression)
        if(!expression->flipped) {
                print_expression_prec(expression->array_ref, prec);
                fputc('[', out);
-               print_expression_prec(expression->index, prec);
+               print_expression_prec(expression->index, PREC_BOTTOM);
                fputc(']', out);
        } else {
                print_expression_prec(expression->index, prec);
                fputc('[', out);
-               print_expression_prec(expression->array_ref, prec);
+               print_expression_prec(expression->array_ref, PREC_BOTTOM);
                fputc(']', out);
        }
 }
@@ -566,14 +638,15 @@ 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_LOG_OR);
        fputs(" ? ", out);
-       print_expression_prec(expression->true_expression, prec);
-       fputs(" : ", out);
-       print_expression_prec(expression->false_expression, prec);
-       fputs(")", out);
+       if (expression->true_expression != NULL) {
+               print_expression_prec(expression->true_expression, PREC_EXPR);
+               fputs(" : ", out);
+       } else {
+               fputs(": ", out);
+       }
+       print_expression_prec(expression->false_expression, PREC_COND);
 }
 
 /**
@@ -613,12 +686,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(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->symbol->string, out);
 }
 
 /**
@@ -644,7 +717,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_prec(designator->array_index, PREC_BOTTOM);
                        fputc(']', out);
                } else {
                        fputc('.', out);
@@ -688,6 +761,9 @@ static void print_statement_expression(const statement_expression_t *expression)
  */
 static void print_expression_prec(const expression_t *expression, unsigned top_prec)
 {
+       if (expression->kind == EXPR_UNARY_CAST_IMPLICIT && !print_implicit_casts) {
+               expression = expression->unary.value;
+       }
        unsigned prec = get_expression_precedence(expression->base.kind);
        if (print_parenthesis && top_prec != PREC_BOTTOM)
                top_prec = PREC_TOP;
@@ -696,16 +772,20 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p
        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);
                break;
-       case EXPR_CHAR_CONST:
-               print_char_const(&expression->conste);
+       case EXPR_WIDE_CHARACTER_CONSTANT:
+               print_wide_character_constant(&expression->conste);
                break;
        case EXPR_CONST:
                print_const(&expression->conste);
                break;
-       case EXPR_FUNCTION:
-       case EXPR_PRETTY_FUNCTION:
+       case EXPR_FUNCNAME:
+               print_funcname(&expression->funcname);
+               break;
        case EXPR_STRING_LITERAL:
                print_string_literal(&expression->string);
                break;
@@ -727,6 +807,9 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p
        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;
@@ -785,10 +868,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;
@@ -805,7 +889,7 @@ static void print_compound_statement(const compound_statement_t *block)
  */
 static void print_return_statement(const return_statement_t *statement)
 {
-       fprintf(out, "return ");
+       fputs("return ", out);
        if(statement->value != NULL)
                print_expression(statement->value);
        fputs(";\n", out);
@@ -829,9 +913,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->symbol->string, out);
+       }
        fputs(";\n", out);
 }
 
@@ -842,11 +930,9 @@ 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);
-       if(statement->statement != NULL) {
-               print_statement(statement->statement);
-       }
+       print_indent();
+       print_statement(statement->statement);
 }
 
 /**
@@ -856,12 +942,10 @@ static void print_label_statement(const label_statement_t *statement)
  */
 static void print_if_statement(const if_statement_t *statement)
 {
-       fputs("if(", out);
+       fputs("if (", out);
        print_expression(statement->condition);
        fputs(") ", out);
-       if(statement->true_statement != NULL) {
-               print_statement(statement->true_statement);
-       }
+       print_statement(statement->true_statement);
 
        if(statement->false_statement != NULL) {
                print_indent();
@@ -877,7 +961,7 @@ static void print_if_statement(const if_statement_t *statement)
  */
 static void print_switch_statement(const switch_statement_t *statement)
 {
-       fputs("switch(", out);
+       fputs("switch (", out);
        print_expression(statement->expression);
        fputs(") ", out);
        print_statement(statement->body);
@@ -919,17 +1003,39 @@ static void print_case_label(const case_label_statement_t *statement)
 static void print_declaration_statement(
                const declaration_statement_t *statement)
 {
-       int first = 1;
+       bool first = true;
        declaration_t *declaration = statement->declarations_begin;
-       for( ; declaration != statement->declarations_end->next;
-              declaration = declaration->next) {
-               if(!first) {
-                       print_indent();
-               } else {
-                       first = 0;
+
+       if (declaration->namespc == NAMESPACE_LOCAL_LABEL) {
+               fputs("__label__ ", out);
+               for (;
+                       declaration != statement->declarations_end->next;
+                       declaration = declaration->next) {
+                       if (!first) {
+                               fputs(", ", out);
+                       } else {
+                               first = false;
+                       }
+                       fputs(declaration->symbol->string, out);
+               }
+               fputs(";\n", out);
+       } else {
+               for (;
+                        declaration != statement->declarations_end->next;
+                        declaration = declaration->next) {
+                       if (declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY)
+                               continue;
+                       if (declaration->implicit)
+                               continue;
+
+                       if (!first) {
+                               print_indent();
+                       } else {
+                               first = false;
+                       }
+                       print_declaration(declaration);
+                       fputc('\n', out);
                }
-               print_declaration(declaration);
-               fputc('\n', out);
        }
 }
 
@@ -940,7 +1046,7 @@ static void print_declaration_statement(
  */
 static void print_while_statement(const while_statement_t *statement)
 {
-       fputs("while(", out);
+       fputs("while (", out);
        print_expression(statement->condition);
        fputs(") ", out);
        print_statement(statement->body);
@@ -956,7 +1062,7 @@ static void print_do_while_statement(const do_while_statement_t *statement)
        fputs("do ", out);
        print_statement(statement->body);
        print_indent();
-       fputs("while(", out);
+       fputs("while (", out);
        print_expression(statement->condition);
        fputs(");\n", out);
 }
@@ -968,11 +1074,14 @@ 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) {
+       fputs("for (", out);
+       declaration_t *decl = statement->scope.declarations;
+       while (decl != NULL && decl->implicit)
+               decl = decl->next;
+       if (decl != NULL) {
                assert(statement->initialisation == NULL);
-               print_declaration(statement->scope.declarations);
-               if(statement->scope.declarations->next != NULL) {
+               print_declaration(decl);
+               if (decl->next != NULL) {
                        panic("multiple declarations in for statement not supported yet");
                }
                fputc(' ', out);
@@ -989,28 +1098,28 @@ static void print_for_statement(const for_statement_t *statement)
        if(statement->step != NULL) {
                print_expression(statement->step);
        }
-       fputs(")", out);
+       fputs(") ", out);
        print_statement(statement->body);
 }
 
 /**
- * Print assembler constraints.
+ * Print assembler arguments.
  *
- * @param constraints   the constraints
+ * @param arguments   the arguments
  */
-static void print_asm_constraints(asm_constraint_t *constraints)
+static void print_asm_arguments(asm_argument_t *arguments)
 {
-       asm_constraint_t *constraint = constraints;
-       for( ; constraint != NULL; constraint = constraint->next) {
-               if(constraint != constraints)
+       asm_argument_t *argument = arguments;
+       for( ; argument != NULL; argument = argument->next) {
+               if(argument != arguments)
                        fputs(", ", out);
 
-               if(constraint->symbol) {
-                       fprintf(out, "[%s] ", constraint->symbol->string);
+               if(argument->symbol) {
+                       fprintf(out, "[%s] ", argument->symbol->string);
                }
-               print_quoted_string(&constraint->constraints, '"');
+               print_quoted_string(&argument->constraints, '"', 1);
                fputs(" (", out);
-               print_expression(constraint->expression);
+               print_expression(argument->expression);
                fputs(")", out);
        }
 }
@@ -1027,7 +1136,7 @@ static void print_asm_clobbers(asm_clobber_t *clobbers)
                if(clobber != clobbers)
                        fputs(", ", out);
 
-               print_quoted_string(&clobber->clobber, '"');
+               print_quoted_string(&clobber->clobber, '"', 1);
        }
 }
 
@@ -1043,18 +1152,18 @@ static void print_asm_statement(const asm_statement_t *statement)
                fputs("volatile ", out);
        }
        fputs("(", out);
-       print_quoted_string(&statement->asm_text, '"');
+       print_quoted_string(&statement->asm_text, '"', 1);
        if(statement->inputs == NULL && statement->outputs == NULL
                        && statement->clobbers == NULL)
                goto end_of_print_asm_statement;
 
        fputs(" : ", out);
-       print_asm_constraints(statement->inputs);
+       print_asm_arguments(statement->inputs);
        if(statement->outputs == NULL && statement->clobbers == NULL)
                goto end_of_print_asm_statement;
 
        fputs(" : ", out);
-       print_asm_constraints(statement->outputs);
+       print_asm_arguments(statement->outputs);
        if(statement->clobbers == NULL)
                goto end_of_print_asm_statement;
 
@@ -1065,6 +1174,37 @@ end_of_print_asm_statement:
        fputs(");\n", out);
 }
 
+/**
+ * Print a microsoft __try statement.
+ *
+ * @param statement   the statement
+ */
+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) {
+               fputs("__except(", out);
+               print_expression(statement->except_expression);
+               fputs(") ", out);
+       } else {
+               fputs("__finally ", out);
+       }
+       print_statement(statement->final_statement);
+}
+
+/**
+ * Print a microsoft __leave statement.
+ *
+ * @param statement   the statement
+ */
+static void print_leave_statement(const leave_statement_t *statement)
+{
+       (void) statement;
+       fputs("__leave;\n", out);
+}
+
 /**
  * Print a statement.
  *
@@ -1072,7 +1212,10 @@ end_of_print_asm_statement:
  */
 void print_statement(const statement_t *statement)
 {
-       switch(statement->kind) {
+       switch (statement->kind) {
+       case STATEMENT_EMPTY:
+               fputs(";\n", out);
+               break;
        case STATEMENT_COMPOUND:
                print_compound_statement(&statement->compound);
                break;
@@ -1118,8 +1261,14 @@ void print_statement(const statement_t *statement)
        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:
-               fprintf(out, "*invalid statement*");
+               fputs("$invalid statement$", out);
                break;
        }
 }
@@ -1154,7 +1303,7 @@ static void print_storage_class(storage_class_tag_t storage_class)
 void print_initializer(const initializer_t *initializer)
 {
        if(initializer == NULL) {
-               fputs("{ NIL-INITIALIZER }", out);
+               fputs("{}", out);
                return;
        }
 
@@ -1172,18 +1321,19 @@ void print_initializer(const initializer_t *initializer)
                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 && sub_init->kind != INITIALIZER_DESIGNATOR) {
-                               fputs(", ", out);
+                       if(i < list->len-1) {
+                               if(sub_init == NULL || sub_init->kind != INITIALIZER_DESIGNATOR)
+                                       fputs(", ", out);
                        }
                }
                fputs(" }", out);
                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);
@@ -1194,6 +1344,79 @@ void print_initializer(const initializer_t *initializer)
        panic("invalid initializer kind found");
 }
 
+/**
+ * Print microsoft extended declaration modifiers.
+ */
+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->get_property_sym != NULL ||
+           declaration->put_property_sym != NULL) {
+               char *next = "(";
+
+               fputs("__declspec", out);
+               if(modifiers & DM_DLLIMPORT) {
+                       fputs(next, out); next = ", "; fputs("dllimport", out);
+               }
+               if(modifiers & DM_DLLEXPORT) {
+                       fputs(next, out); next = ", "; fputs("dllexport", out);
+               }
+               if(modifiers & DM_THREAD) {
+                       fputs(next, out); next = ", "; fputs("thread", out);
+               }
+               if(modifiers & DM_NAKED) {
+                       fputs(next, out); next = ", "; fputs("naked", out);
+               }
+               if(modifiers & DM_THREAD) {
+                       fputs(next, out); next = ", "; fputs("thread", out);
+               }
+               if(modifiers & DM_SELECTANY) {
+                       fputs(next, out); next = ", "; fputs("selectany", out);
+               }
+               if(modifiers & DM_NOTHROW) {
+                       fputs(next, out); next = ", "; fputs("nothrow", out);
+               }
+               if(modifiers & DM_NORETURN) {
+                       fputs(next, out); next = ", "; fputs("noreturn", out);
+               }
+               if(modifiers & DM_NOINLINE) {
+                       fputs(next, out); next = ", "; fputs("noinline", out);
+               }
+               if (modifiers & DM_DEPRECATED) {
+                       fputs(next, out); next = ", "; fputs("deprecated", out);
+                       if(declaration->deprecated_string != NULL)
+                               fprintf(out, "(\"%s\")", declaration->deprecated_string);
+               }
+               if(declaration->alignment != 0) {
+                       fputs(next, out); next = ", "; fprintf(out, "align(%u)", declaration->alignment);
+               }
+               if(modifiers & DM_RESTRICT) {
+                       fputs(next, out); next = ", "; fputs("restrict", out);
+               }
+               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 = ", "; fputs("property(", out);
+                       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);
+               }
+               fputs(") ", out);
+       }
+}
+
 /**
  * Print a declaration in the NORMAL namespace.
  *
@@ -1202,12 +1425,16 @@ void print_initializer(const initializer_t *initializer)
 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)
+       if (declaration->is_inline) {
+               if (declaration->modifiers & DM_FORCEINLINE) {
                        fputs("__forceinline ", out);
-               else
+               } else if (declaration->modifiers & DM_MICROSOFT_INLINE) {
+                       fputs("__inline ", out);
+               } else {
                        fputs("inline ", out);
+               }
        }
+       print_ms_modifiers(declaration);
        print_type_ext(declaration->type, declaration->symbol,
                       &declaration->scope);
 
@@ -1240,11 +1467,11 @@ void print_expression(const expression_t *expression) {
  */
 void print_declaration(const declaration_t *declaration)
 {
-       if(declaration->namespc != NAMESPACE_NORMAL &&
-                       declaration->symbol == NULL)
+       if (declaration->namespc != NAMESPACE_NORMAL &&
+           declaration->symbol == NULL)
                return;
 
-       switch(declaration->namespc) {
+       switch (declaration->namespc) {
        case NAMESPACE_NORMAL:
                print_normal_declaration(declaration);
                break;
@@ -1288,6 +1515,8 @@ void print_ast(const translation_unit_t *unit)
                if(declaration->namespc != NAMESPACE_NORMAL &&
                                declaration->symbol == NULL)
                        continue;
+               if (declaration->implicit)
+                       continue;
 
                print_indent();
                print_declaration(declaration);
@@ -1306,7 +1535,7 @@ bool is_constant_initializer(const initializer_t *initializer)
        case INITIALIZER_VALUE:
                return is_constant_expression(initializer->value.value);
 
-       case INITIALIZER_LIST: {
+       case INITIALIZER_LIST:
                for(size_t i = 0; i < initializer->list.len; ++i) {
                        initializer_t *sub_initializer = initializer->list.initializers[i];
                        if(!is_constant_initializer(sub_initializer))
@@ -1314,22 +1543,22 @@ bool is_constant_initializer(const initializer_t *initializer)
                }
                return true;
        }
-       }
        panic("invalid initializer kind found");
 }
 
-static bool is_object_with_constant_address(const expression_t *expression)
+static bool is_object_with_linker_constant_address(const expression_t *expression)
 {
        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 {
-                       return is_object_with_constant_address(expression->select.compound);
+                       return is_object_with_linker_constant_address(expression->select.compound);
                }
        }
 
@@ -1358,12 +1587,30 @@ bool is_address_constant(const expression_t *expression)
 {
        switch(expression->kind) {
        case EXPR_UNARY_TAKE_ADDRESS:
-               return is_object_with_constant_address(expression->unary.value);
+               return is_object_with_linker_constant_address(expression->unary.value);
+
+       case EXPR_UNARY_DEREFERENCE: {
+               type_t *real_type
+                       = 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);
+               }
 
-       case EXPR_UNARY_CAST:
-               return is_type_pointer(skip_typeref(expression->base.type))
-                       && (is_constant_expression(expression->unary.value)
+               /* 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()))))
+                       return false;
+
+               return (is_constant_expression(expression->unary.value)
                        || is_address_constant(expression->unary.value));
+       }
 
        case EXPR_BINARY_ADD:
        case EXPR_BINARY_SUB: {
@@ -1385,7 +1632,7 @@ bool is_address_constant(const expression_t *expression)
                if(is_type_function(type))
                        return true;
                if(is_type_array(type)) {
-                       return is_object_with_constant_address(expression);
+                       return is_object_with_linker_constant_address(expression);
                }
                return false;
        }
@@ -1395,26 +1642,92 @@ bool is_address_constant(const expression_t *expression)
        }
 }
 
-bool is_constant_expression(const expression_t *expression)
+static bool is_builtin_const_call(const expression_t *expression)
+{
+       expression_t *function = expression->call.function;
+       if (function->kind != EXPR_BUILTIN_SYMBOL) {
+               return false;
+       }
+
+       symbol_t *symbol = function->builtin_symbol.symbol;
+
+       switch (symbol->ID) {
+       case T___builtin_huge_val:
+       case T___builtin_nan:
+       case T___builtin_nanf:
+       case T___builtin_nand:
+               return true;
+       }
+
+       return false;
+}
+
+static bool is_constant_pointer(const expression_t *expression)
+{
+       if (is_constant_expression(expression))
+               return true;
+
+       switch (expression->kind) {
+       case EXPR_UNARY_CAST:
+               return is_constant_pointer(expression->unary.value);
+       default:
+               return false;
+       }
+}
+
+static bool is_object_with_constant_address(const expression_t *expression)
 {
        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)) {
+                       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_UNARY_DEREFERENCE:
+               return is_constant_pointer(expression->unary.value);
+       default:
+               return false;
+       }
+}
+
+bool is_constant_expression(const expression_t *expression)
+{
+       switch (expression->kind) {
 
        case EXPR_CONST:
-       case EXPR_CHAR_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_FUNCTION:
-       case EXPR_PRETTY_FUNCTION:
+       case EXPR_FUNCNAME:
        case EXPR_OFFSETOF:
        case EXPR_ALIGNOF:
        case EXPR_BUILTIN_CONSTANT_P:
+       case EXPR_LABEL_ADDRESS:
                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_CALL:
        case EXPR_SELECT:
        case EXPR_VA_START:
        case EXPR_VA_ARG:
@@ -1423,10 +1736,8 @@ bool is_constant_expression(const expression_t *expression)
        case EXPR_UNARY_POSTFIX_DECREMENT:
        case EXPR_UNARY_PREFIX_INCREMENT:
        case EXPR_UNARY_PREFIX_DECREMENT:
-       case EXPR_UNARY_BITFIELD_EXTRACT:
        case EXPR_UNARY_ASSUME: /* has VOID type */
        case EXPR_UNARY_DEREFERENCE:
-       case EXPR_UNARY_TAKE_ADDRESS:
        case EXPR_BINARY_ASSIGN:
        case EXPR_BINARY_MUL_ASSIGN:
        case EXPR_BINARY_DIV_ASSIGN:
@@ -1439,8 +1750,15 @@ 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:
+               return is_object_with_constant_address(expression->unary.value);
+
+       case EXPR_CALL:
+               return is_builtin_const_call(expression);
+
        case EXPR_UNARY_NEGATE:
        case EXPR_UNARY_PLUS:
        case EXPR_UNARY_BITWISE_NEGATE:
@@ -1495,10 +1813,6 @@ bool is_constant_expression(const expression_t *expression)
                        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)
@@ -1507,8 +1821,10 @@ bool is_constant_expression(const expression_t *expression)
                return false;
        }
 
-       case EXPR_UNKNOWN:
        case EXPR_INVALID:
+               return true;
+
+       case EXPR_UNKNOWN:
                break;
        }
        panic("invalid expression found (is constant expression)");