X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast.c;h=727d758c740c0e2a2b122712f7dba0d490c8ce8e;hb=fbc026427aa34c595fea99e4d4608c76ea7c55c4;hp=bf93a142cf11e732fa403437edd9b53154a9fd51;hpb=c70d997cbcb50de2af08341fbf1ea8f4a9a6f013;p=cparser diff --git a/ast.c b/ast.c index bf93a14..727d758 100644 --- a/ast.c +++ b/ast.c @@ -1,6 +1,6 @@ /* * This file is part of cparser. - * Copyright (C) 2007-2008 Matthias Braun + * Copyright (C) 2007-2009 Matthias Braun * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -25,24 +25,27 @@ #include "parser.h" #include "lang_features.h" #include "entity_t.h" +#include "printer.h" #include #include #include #include -#ifdef __INTEL_COMPILER +#if defined(__INTEL_COMPILER) #include +#elif defined(__CYGWIN__) +#include "win32/cygwin_math_ext.h" #else #include #endif #include "adt/error.h" +#include "adt/util.h" struct obstack ast_obstack; -static FILE *out; -static int indent; +static int indent; /** If set, implicit casts are printed. */ bool print_implicit_casts = false; @@ -62,7 +65,7 @@ void change_indent(int delta) void print_indent(void) { for (int i = 0; i < indent; ++i) - fputc('\t', out); + print_string("\t"); } /** @@ -74,13 +77,13 @@ void print_indent(void) static int right_to_left(unsigned precedence) { switch (precedence) { - case PREC_ASSIGNMENT: - case PREC_CONDITIONAL: - case PREC_UNARY: - return 1; + case PREC_ASSIGNMENT: + case PREC_CONDITIONAL: + case PREC_UNARY: + return 1; - default: - return 0; + default: + return 0; } } @@ -92,90 +95,90 @@ static int right_to_left(unsigned precedence) static unsigned get_expression_precedence(expression_kind_t kind) { static const unsigned prec[] = { - [EXPR_UNKNOWN] = PREC_PRIMARY, - [EXPR_INVALID] = PREC_PRIMARY, - [EXPR_REFERENCE] = PREC_PRIMARY, - [EXPR_REFERENCE_ENUM_VALUE] = PREC_PRIMARY, - [EXPR_CHARACTER_CONSTANT] = PREC_PRIMARY, - [EXPR_WIDE_CHARACTER_CONSTANT] = PREC_PRIMARY, - [EXPR_CONST] = PREC_PRIMARY, - [EXPR_STRING_LITERAL] = PREC_PRIMARY, - [EXPR_WIDE_STRING_LITERAL] = PREC_PRIMARY, - [EXPR_COMPOUND_LITERAL] = PREC_UNARY, - [EXPR_CALL] = PREC_POSTFIX, - [EXPR_CONDITIONAL] = PREC_CONDITIONAL, - [EXPR_SELECT] = PREC_POSTFIX, - [EXPR_ARRAY_ACCESS] = PREC_POSTFIX, - [EXPR_SIZEOF] = PREC_UNARY, - [EXPR_CLASSIFY_TYPE] = PREC_UNARY, - [EXPR_ALIGNOF] = PREC_UNARY, - - [EXPR_FUNCNAME] = PREC_PRIMARY, - [EXPR_BUILTIN_SYMBOL] = PREC_PRIMARY, - [EXPR_BUILTIN_CONSTANT_P] = PREC_PRIMARY, - [EXPR_BUILTIN_PREFETCH] = PREC_PRIMARY, - [EXPR_OFFSETOF] = PREC_PRIMARY, - [EXPR_VA_START] = PREC_PRIMARY, - [EXPR_VA_ARG] = PREC_PRIMARY, - [EXPR_STATEMENT] = PREC_PRIMARY, - [EXPR_LABEL_ADDRESS] = PREC_PRIMARY, - - [EXPR_UNARY_NEGATE] = PREC_UNARY, - [EXPR_UNARY_PLUS] = PREC_UNARY, - [EXPR_UNARY_BITWISE_NEGATE] = PREC_UNARY, - [EXPR_UNARY_NOT] = PREC_UNARY, - [EXPR_UNARY_DEREFERENCE] = PREC_UNARY, - [EXPR_UNARY_TAKE_ADDRESS] = PREC_UNARY, - [EXPR_UNARY_POSTFIX_INCREMENT] = PREC_POSTFIX, - [EXPR_UNARY_POSTFIX_DECREMENT] = PREC_POSTFIX, - [EXPR_UNARY_PREFIX_INCREMENT] = PREC_UNARY, - [EXPR_UNARY_PREFIX_DECREMENT] = PREC_UNARY, - [EXPR_UNARY_CAST] = PREC_UNARY, - [EXPR_UNARY_CAST_IMPLICIT] = PREC_UNARY, - [EXPR_UNARY_ASSUME] = PREC_PRIMARY, - [EXPR_UNARY_DELETE] = PREC_UNARY, - [EXPR_UNARY_DELETE_ARRAY] = PREC_UNARY, - [EXPR_UNARY_THROW] = PREC_ASSIGNMENT, - - [EXPR_BINARY_ADD] = PREC_ADDITIVE, - [EXPR_BINARY_SUB] = PREC_ADDITIVE, - [EXPR_BINARY_MUL] = PREC_MULTIPLICATIVE, - [EXPR_BINARY_DIV] = PREC_MULTIPLICATIVE, - [EXPR_BINARY_MOD] = PREC_MULTIPLICATIVE, - [EXPR_BINARY_EQUAL] = PREC_EQUALITY, - [EXPR_BINARY_NOTEQUAL] = PREC_EQUALITY, - [EXPR_BINARY_LESS] = PREC_RELATIONAL, - [EXPR_BINARY_LESSEQUAL] = PREC_RELATIONAL, - [EXPR_BINARY_GREATER] = PREC_RELATIONAL, - [EXPR_BINARY_GREATEREQUAL] = PREC_RELATIONAL, - [EXPR_BINARY_BITWISE_AND] = PREC_AND, - [EXPR_BINARY_BITWISE_OR] = PREC_OR, - [EXPR_BINARY_BITWISE_XOR] = PREC_XOR, - [EXPR_BINARY_LOGICAL_AND] = PREC_LOGICAL_AND, - [EXPR_BINARY_LOGICAL_OR] = PREC_LOGICAL_OR, - [EXPR_BINARY_SHIFTLEFT] = PREC_SHIFT, - [EXPR_BINARY_SHIFTRIGHT] = PREC_SHIFT, - [EXPR_BINARY_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_MUL_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_DIV_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_MOD_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_ADD_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_SUB_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_SHIFTLEFT_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_SHIFTRIGHT_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_BITWISE_AND_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_BITWISE_XOR_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_BITWISE_OR_ASSIGN] = PREC_ASSIGNMENT, - [EXPR_BINARY_COMMA] = PREC_EXPRESSION, - - [EXPR_BINARY_ISGREATER] = PREC_PRIMARY, - [EXPR_BINARY_ISGREATEREQUAL] = PREC_PRIMARY, - [EXPR_BINARY_ISLESS] = PREC_PRIMARY, - [EXPR_BINARY_ISLESSEQUAL] = PREC_PRIMARY, - [EXPR_BINARY_ISLESSGREATER] = PREC_PRIMARY, - [EXPR_BINARY_ISUNORDERED] = PREC_PRIMARY + [EXPR_UNKNOWN] = PREC_PRIMARY, + [EXPR_INVALID] = PREC_PRIMARY, + [EXPR_REFERENCE] = PREC_PRIMARY, + [EXPR_REFERENCE_ENUM_VALUE] = PREC_PRIMARY, + [EXPR_CHARACTER_CONSTANT] = PREC_PRIMARY, + [EXPR_WIDE_CHARACTER_CONSTANT] = PREC_PRIMARY, + [EXPR_CONST] = PREC_PRIMARY, + [EXPR_STRING_LITERAL] = PREC_PRIMARY, + [EXPR_WIDE_STRING_LITERAL] = PREC_PRIMARY, + [EXPR_COMPOUND_LITERAL] = PREC_UNARY, + [EXPR_CALL] = PREC_POSTFIX, + [EXPR_CONDITIONAL] = PREC_CONDITIONAL, + [EXPR_SELECT] = PREC_POSTFIX, + [EXPR_ARRAY_ACCESS] = PREC_POSTFIX, + [EXPR_SIZEOF] = PREC_UNARY, + [EXPR_CLASSIFY_TYPE] = PREC_UNARY, + [EXPR_ALIGNOF] = PREC_UNARY, + + [EXPR_FUNCNAME] = PREC_PRIMARY, + [EXPR_BUILTIN_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 }; - assert((unsigned)kind < (sizeof(prec)/sizeof(prec[0]))); + assert((size_t)kind < lengthof(prec)); unsigned res = prec[kind]; assert(res != PREC_BOTTOM); @@ -195,19 +198,19 @@ static void print_const(const const_expression_t *cnst) const type_t *const type = skip_typeref(cnst->base.type); if (is_type_atomic(type, ATOMIC_TYPE_BOOL)) { - fputs(cnst->v.int_value ? "true" : "false", out); + print_string(cnst->v.int_value ? "true" : "false"); } else if (is_type_integer(type)) { - fprintf(out, "%lld", cnst->v.int_value); + print_format("%lld", cnst->v.int_value); } else if (is_type_float(type)) { long double const val = cnst->v.float_value; #ifdef _WIN32 /* ARG, no way to print long double */ - fprintf(out, "%.20g", (double)val); + print_format("%.20g", (double)val); #else - fprintf(out, "%.20Lg", val); + print_format("%.20Lg", val); #endif if (isfinite(val) && truncl(val) == val) - fputs(".0", out); + print_string(".0"); } else { panic("unknown constant"); } @@ -224,7 +227,7 @@ static void print_const(const const_expression_t *cnst) default: return; } - fputs(suffix, out); + print_string(suffix); } /** @@ -236,37 +239,38 @@ static void print_const(const const_expression_t *cnst) */ static void print_quoted_string(const string_t *const string, char border, int skip) { - fputc(border, out); + print_char(border); const char *end = string->begin + string->size - skip; for (const char *c = string->begin; c != end; ++c) { - if (*c == border) { - fputc('\\', out); + unsigned char const tc = *c; + if (tc == border) { + print_string("\\"); } - switch (*c) { - case '\\': fputs("\\\\", out); break; - case '\a': fputs("\\a", out); break; - case '\b': fputs("\\b", out); break; - case '\f': fputs("\\f", out); break; - case '\n': fputs("\\n", out); break; - case '\r': fputs("\\r", out); break; - case '\t': fputs("\\t", out); break; - case '\v': fputs("\\v", out); break; - case '\?': fputs("\\?", out); break; + switch (tc) { + case '\\': print_string("\\\\"); break; + case '\a': print_string("\\a"); break; + case '\b': print_string("\\b"); break; + case '\f': print_string("\\f"); break; + case '\n': print_string("\\n"); break; + case '\r': print_string("\\r"); break; + case '\t': print_string("\\t"); break; + case '\v': print_string("\\v"); break; + case '\?': print_string("\\?"); break; case 27: if (c_mode & _GNUC) { - fputs("\\e", out); break; + print_string("\\e"); break; } /* FALLTHROUGH */ default: - if (!isprint(*c)) { - fprintf(out, "\\%03o", (unsigned)*c); - break; + if (tc < 0x80 && !isprint(tc)) { + print_format("\\%03o", (unsigned)tc); + } else { + print_char(tc); } - fputc(*c, out); break; } } - fputc(border, out); + print_char(border); } /** @@ -279,51 +283,41 @@ static void print_quoted_string(const string_t *const string, char border, int s static void print_quoted_wide_string(const wide_string_t *const wstr, char border, int skip) { - fputc('L', out); - fputc(border, out); + print_string("L"); + print_char(border); 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; - case L'\a': fputs("\\a", out); break; - case L'\b': fputs("\\b", out); break; - case L'\f': fputs("\\f", out); break; - case L'\n': fputs("\\n", out); break; - case L'\r': fputs("\\r", out); break; - case L'\t': fputs("\\t", out); break; - case L'\v': fputs("\\v", out); break; - case L'\?': fputs("\\?", out); break; + case L'\"': print_string("\\\""); break; + case L'\\': print_string("\\\\"); break; + case L'\a': print_string("\\a"); break; + case L'\b': print_string("\\b"); break; + case L'\f': print_string("\\f"); break; + case L'\n': print_string("\\n"); break; + case L'\r': print_string("\\r"); break; + case L'\t': print_string("\\t"); break; + case L'\v': print_string("\\v"); break; + case L'\?': print_string("\\?"); break; case 27: if (c_mode & _GNUC) { - fputs("\\e", out); break; + print_string("\\e"); break; } /* FALLTHROUGH */ default: { const unsigned tc = *c; if (tc < 0x80U) { - if (!isprint(*c)) { - fprintf(out, "\\%03o", (char)*c); + if (isprint(*c)) { + print_char(*c); } else { - fputc(*c, out); + print_format("\\%03o", tc); } - } else if (tc < 0x800) { - fputc(0xC0 | (tc >> 6), out); - fputc(0x80 | (tc & 0x3F), out); - } else if (tc < 0x10000) { - fputc(0xE0 | ( tc >> 12), out); - fputc(0x80 | ((tc >> 6) & 0x3F), out); - fputc(0x80 | ( tc & 0x3F), out); } else { - fputc(0xF0 | ( tc >> 18), out); - fputc(0x80 | ((tc >> 12) & 0x3F), out); - fputc(0x80 | ((tc >> 6) & 0x3F), out); - fputc(0x80 | ( tc & 0x3F), out); + print_char(tc); } } } } - fputc(border, out); + print_char(border); } /** @@ -364,7 +358,7 @@ static void print_funcname(const funcname_expression_t *funcname) case FUNCNAME_FUNCSIG: s = "__FUNCSIG__"; break; case FUNCNAME_FUNCDNAME: s = "__FUNCDNAME__"; break; } - fputs(s, out); + print_string(s); } static void print_wide_string_literal( @@ -376,9 +370,9 @@ static void print_wide_string_literal( static void print_compound_literal( const compound_literal_expression_t *expression) { - fputc('(', out); + print_string("("); print_type(expression->type); - fputc(')', out); + print_string(")"); print_initializer(expression->initializer); } @@ -394,14 +388,13 @@ static void print_assignment_expression(const expression_t *const expr) */ static void print_call_expression(const call_expression_t *call) { - unsigned prec = get_expression_precedence(call->base.kind); - print_expression_prec(call->function, prec); - fputc('(', out); + print_expression_prec(call->function, PREC_POSTFIX); + print_string("("); call_argument_t *argument = call->arguments; int first = 1; while (argument != NULL) { if (!first) { - fputs(", ", out); + print_string(", "); } else { first = 0; } @@ -409,7 +402,7 @@ static void print_call_expression(const call_expression_t *call) argument = argument->next; } - fputc(')', out); + print_string(")"); } /** @@ -458,7 +451,7 @@ static void print_binary_expression(const binary_expression_t *binexpr) case EXPR_BINARY_SHIFTRIGHT_ASSIGN: op = " >>= "; break; default: panic("invalid binexpression found"); } - fputs(op, out); + print_string(op); print_expression_prec(binexpr->right, prec + 1 - r2l); } @@ -471,43 +464,43 @@ 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: fputc('-', out); break; - case EXPR_UNARY_PLUS: fputc('+', out); break; - case EXPR_UNARY_NOT: fputc('!', out); break; - case EXPR_UNARY_BITWISE_NEGATE: fputc('~', out); break; - case EXPR_UNARY_PREFIX_INCREMENT: fputs("++", out); break; - case EXPR_UNARY_PREFIX_DECREMENT: fputs("--", out); break; - case EXPR_UNARY_DEREFERENCE: fputc('*', out); break; - case EXPR_UNARY_TAKE_ADDRESS: fputc('&', out); break; - case EXPR_UNARY_DELETE: fputs("delete ", out); break; - case EXPR_UNARY_DELETE_ARRAY: fputs("delete [] ", out); break; + case EXPR_UNARY_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_DELETE_ARRAY: print_string("delete [] "); break; case EXPR_UNARY_POSTFIX_INCREMENT: print_expression_prec(unexpr->value, prec); - fputs("++", out); + print_string("++"); return; case EXPR_UNARY_POSTFIX_DECREMENT: print_expression_prec(unexpr->value, prec); - fputs("--", out); + print_string("--"); return; case EXPR_UNARY_CAST_IMPLICIT: case EXPR_UNARY_CAST: - fputc('(', out); + print_string("("); print_type(unexpr->base.type); - fputc(')', out); + print_string(")"); break; case EXPR_UNARY_ASSUME: - fputs("__assume(", out); + print_string("__assume("); print_assignment_expression(unexpr->value); - fputc(')', out); + print_string(")"); return; case EXPR_UNARY_THROW: if (unexpr->value == NULL) { - fputs("throw", out); + print_string("throw"); return; } - fputs("throw ", out); + print_string("throw "); break; default: @@ -523,7 +516,7 @@ static void print_unary_expression(const unary_expression_t *unexpr) */ static void print_reference_expression(const reference_expression_t *ref) { - fputs(ref->entity->base.symbol->string, out); + print_string(ref->entity->base.symbol->string); } /** @@ -533,7 +526,7 @@ static void print_reference_expression(const reference_expression_t *ref) */ static void print_label_address_expression(const label_address_expression_t *le) { - fprintf(out, "&&%s", le->label->base.symbol->string); + print_format("&&%s", le->label->base.symbol->string); } /** @@ -543,17 +536,16 @@ static void print_label_address_expression(const label_address_expression_t *le) */ static void print_array_expression(const array_access_expression_t *expression) { - unsigned prec = get_expression_precedence(expression->base.kind); if (!expression->flipped) { - print_expression_prec(expression->array_ref, prec); - fputc('[', out); + print_expression_prec(expression->array_ref, PREC_POSTFIX); + print_string("["); print_expression(expression->index); - fputc(']', out); + print_string("]"); } else { - print_expression_prec(expression->index, prec); - fputc('[', out); + print_expression_prec(expression->index, PREC_POSTFIX); + print_string("["); print_expression(expression->array_ref); - fputc(']', out); + print_string("]"); } } @@ -565,33 +557,21 @@ 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) { - fputs("sizeof", out); + print_string("sizeof"); } else { assert(expression->base.kind == EXPR_ALIGNOF); - fputs("__alignof__", out); + print_string("__alignof__"); } if (expression->tp_expression != NULL) { - /* always print the '()' here, sizeof x is right but unusual */ - fputc('(', out); - print_expression(expression->tp_expression); - fputc(')', out); + /* PREC_TOP: always print the '()' here, sizeof x is right but unusual */ + print_expression_prec(expression->tp_expression, PREC_TOP); } else { - fputc('(', out); + print_string("("); print_type(expression->type); - fputc(')', out); + print_string(")"); } } -/** - * Prints an builtin symbol. - * - * @param expression the builtin symbol expression - */ -static void print_builtin_symbol(const builtin_symbol_expression_t *expression) -{ - fputs(expression->symbol->string, out); -} - /** * Prints a builtin constant expression. * @@ -599,29 +579,24 @@ static void print_builtin_symbol(const builtin_symbol_expression_t *expression) */ static void print_builtin_constant(const builtin_constant_expression_t *expression) { - fputs("__builtin_constant_p(", out); + print_string("__builtin_constant_p("); print_assignment_expression(expression->value); - fputc(')', out); + print_string(")"); } /** - * Prints a builtin prefetch expression. + * Prints a builtin types compatible expression. * - * @param expression the builtin prefetch expression + * @param expression the builtin types compatible expression */ -static void print_builtin_prefetch(const builtin_prefetch_expression_t *expression) +static void print_builtin_types_compatible( + const builtin_types_compatible_expression_t *expression) { - fputs("__builtin_prefetch(", out); - print_assignment_expression(expression->adr); - if (expression->rw) { - fputc(',', out); - print_assignment_expression(expression->rw); - } - if (expression->locality) { - fputc(',', out); - print_assignment_expression(expression->locality); - } - fputc(')', out); + print_string("__builtin_types_compatible_p("); + print_type(expression->left); + print_string(", "); + print_type(expression->right); + print_string(")"); } /** @@ -632,12 +607,12 @@ static void print_builtin_prefetch(const builtin_prefetch_expression_t *expressi static void print_conditional(const conditional_expression_t *expression) { print_expression_prec(expression->condition, PREC_LOGICAL_OR); - fputs(" ? ", out); if (expression->true_expression != NULL) { + print_string(" ? "); print_expression_prec(expression->true_expression, PREC_EXPRESSION); - fputs(" : ", out); + print_string(" : "); } else { - fputs(": ", out); + print_string(" ?: "); } precedence_t prec = c_mode & _CXX ? PREC_ASSIGNMENT : PREC_CONDITIONAL; print_expression_prec(expression->false_expression, prec); @@ -650,11 +625,11 @@ static void print_conditional(const conditional_expression_t *expression) */ static void print_va_start(const va_start_expression_t *const expression) { - fputs("__builtin_va_start(", out); + print_string("__builtin_va_start("); print_assignment_expression(expression->ap); - fputs(", ", out); - fputs(expression->parameter->base.base.symbol->string, out); - fputc(')', out); + print_string(", "); + print_string(expression->parameter->base.base.symbol->string); + print_string(")"); } /** @@ -664,11 +639,25 @@ static void print_va_start(const va_start_expression_t *const expression) */ static void print_va_arg(const va_arg_expression_t *expression) { - fputs("__builtin_va_arg(", out); + print_string("__builtin_va_arg("); print_assignment_expression(expression->ap); - fputs(", ", out); + print_string(", "); print_type(expression->base.type); - fputc(')', out); + print_string(")"); +} + +/** + * Prints a va_copy expression. + * + * @param expression the va_copy expression + */ +static void print_va_copy(const va_copy_expression_t *expression) +{ + print_string("__builtin_va_copy("); + print_assignment_expression(expression->dst); + print_string(", "); + print_assignment_expression(expression->src); + print_string(")"); } /** @@ -678,14 +667,13 @@ static void print_va_arg(const va_arg_expression_t *expression) */ static void print_select(const select_expression_t *expression) { - unsigned prec = get_expression_precedence(expression->base.kind); - print_expression_prec(expression->compound, prec); + print_expression_prec(expression->compound, PREC_POSTFIX); if (is_type_pointer(skip_typeref(expression->compound->base.type))) { - fputs("->", out); + print_string("->"); } else { - fputc('.', out); + print_string("."); } - fputs(expression->compound_entry->base.symbol->string, out); + print_string(expression->compound_entry->base.symbol->string); } /** @@ -696,9 +684,9 @@ static void print_select(const select_expression_t *expression) static void print_classify_type_expression( const classify_type_expression_t *const expr) { - fputs("__builtin_classify_type(", out); + print_string("__builtin_classify_type("); print_assignment_expression(expr->type_expression); - fputc(')', out); + print_string(")"); } /** @@ -710,12 +698,12 @@ static void print_designator(const designator_t *designator) { for ( ; designator != NULL; designator = designator->next) { if (designator->symbol == NULL) { - fputc('[', out); + print_string("["); print_expression(designator->array_index); - fputc(']', out); + print_string("]"); } else { - fputc('.', out); - fputs(designator->symbol->string, out); + print_string("."); + print_string(designator->symbol->string); } } } @@ -727,12 +715,11 @@ static void print_designator(const designator_t *designator) */ static void print_offsetof_expression(const offsetof_expression_t *expression) { - fputs("__builtin_offsetof", out); - fputc('(', out); + print_string("__builtin_offsetof("); print_type(expression->type); - fputc(',', out); + print_string(","); print_designator(expression->designator); - fputc(')', out); + print_string(")"); } /** @@ -742,9 +729,9 @@ static void print_offsetof_expression(const offsetof_expression_t *expression) */ static void print_statement_expression(const statement_expression_t *expression) { - fputc('(', out); + print_string("("); print_statement(expression->statement); - fputc(')', out); + print_string(")"); } /** @@ -765,11 +752,11 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p top_prec > get_expression_precedence(expression->base.kind); if (parenthesized) - fputc('(', out); + print_string("("); switch (expression->kind) { case EXPR_UNKNOWN: case EXPR_INVALID: - fputs("$invalid expression$", out); + print_string("$invalid expression$"); break; case EXPR_CHARACTER_CONSTANT: print_character_constant(&expression->conste); @@ -815,14 +802,11 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p case EXPR_ALIGNOF: print_typeprop_expression(&expression->typeprop); break; - case EXPR_BUILTIN_SYMBOL: - print_builtin_symbol(&expression->builtin_symbol); - break; case EXPR_BUILTIN_CONSTANT_P: print_builtin_constant(&expression->builtin_constant); break; - case EXPR_BUILTIN_PREFETCH: - print_builtin_prefetch(&expression->builtin_prefetch); + case EXPR_BUILTIN_TYPES_COMPATIBLE_P: + print_builtin_types_compatible(&expression->builtin_types_compatible); break; case EXPR_CONDITIONAL: print_conditional(&expression->conditional); @@ -833,6 +817,9 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p 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; @@ -848,11 +835,11 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p default: /* TODO */ - fprintf(out, "some expression of type %d", (int)expression->kind); + print_format("some expression of type %d", (int)expression->kind); break; } if (parenthesized) - fputc(')', out); + print_string(")"); } /** @@ -862,7 +849,7 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p */ static void print_compound_statement(const compound_statement_t *block) { - fputs("{\n", out); + print_string("{\n"); ++indent; statement_t *statement = block->statements; @@ -877,7 +864,7 @@ static void print_compound_statement(const compound_statement_t *block) } --indent; print_indent(); - fputs("}\n", out); + print_string(block->stmt_expr ? "}" : "}\n"); } /** @@ -889,11 +876,11 @@ static void print_return_statement(const return_statement_t *statement) { expression_t const *const val = statement->value; if (val != NULL) { - fputs("return ", out); + print_string("return "); print_expression(val); - fputs(";\n", out); + print_string(";\n"); } else { - fputs("return;\n", out); + print_string("return;\n"); } } @@ -905,7 +892,7 @@ static void print_return_statement(const return_statement_t *statement) static void print_expression_statement(const expression_statement_t *statement) { print_expression(statement->expression); - fputs(";\n", out); + print_string(";\n"); } /** @@ -915,14 +902,14 @@ static void print_expression_statement(const expression_statement_t *statement) */ static void print_goto_statement(const goto_statement_t *statement) { - fputs("goto ", out); + print_string("goto "); if (statement->expression != NULL) { - fputc('*', out); + print_string("*"); print_expression(statement->expression); } else { - fputs(statement->label->base.symbol->string, out); + print_string(statement->label->base.symbol->string); } - fputs(";\n", out); + print_string(";\n"); } /** @@ -932,7 +919,7 @@ static void print_goto_statement(const goto_statement_t *statement) */ static void print_label_statement(const label_statement_t *statement) { - fprintf(out, "%s:\n", statement->label->base.symbol->string); + print_format("%s:\n", statement->label->base.symbol->string); print_indent(); print_statement(statement->statement); } @@ -944,14 +931,14 @@ static void print_label_statement(const label_statement_t *statement) */ static void print_if_statement(const if_statement_t *statement) { - fputs("if (", out); + print_string("if ("); print_expression(statement->condition); - fputs(") ", out); + print_string(") "); print_statement(statement->true_statement); if (statement->false_statement != NULL) { print_indent(); - fputs("else ", out); + print_string("else "); print_statement(statement->false_statement); } } @@ -963,9 +950,9 @@ static void print_if_statement(const if_statement_t *statement) */ static void print_switch_statement(const switch_statement_t *statement) { - fputs("switch (", out); + print_string("switch ("); print_expression(statement->expression); - fputs(") ", out); + print_string(") "); print_statement(statement->body); } @@ -977,15 +964,15 @@ static void print_switch_statement(const switch_statement_t *statement) static void print_case_label(const case_label_statement_t *statement) { if (statement->expression == NULL) { - fputs("default:\n", out); + print_string("default:\n"); } else { - fputs("case ", out); + print_string("case "); print_expression(statement->expression); if (statement->end_range != NULL) { - fputs(" ... ", out); + print_string(" ... "); print_expression(statement->end_range); } - fputs(":\n", out); + print_string(":\n"); } ++indent; if (statement->statement != NULL) { @@ -997,30 +984,11 @@ static void print_case_label(const case_label_statement_t *statement) } } -static void print_local_label(const local_label_statement_t *statement) -{ - fputs("__label__ ", out); - - bool first = true; - entity_t *entity = statement->labels_begin; - for (; - entity != statement->labels_end->base.next; - entity = entity->base.next) { - if (!first) { - fputs(", ", out); - } else { - first = false; - } - fputs(entity->base.symbol->string, out); - } - fputs(";\n", out); -} - static void print_typedef(const entity_t *entity) { - fputs("typedef ", out); + print_string("typedef "); print_type_ext(entity->typedefe.type, entity->base.symbol, NULL); - fputc(';', out); + print_string(";"); } /** @@ -1049,13 +1017,13 @@ static void print_declaration_statement( bool first = true; entity_t *entity = statement->declarations_begin; if (entity == NULL) { - fputs("/* empty declaration statement */\n", out); + print_string("/* empty declaration statement */\n"); return; } entity_t *const end = statement->declarations_end->base.next; for (; entity != end; entity = entity->base.next) { - if (!is_declaration(entity) && entity->kind != ENTITY_TYPEDEF) + if (entity->kind == ENTITY_ENUM_VALUE) continue; if (is_generated_entity(entity)) continue; @@ -1066,14 +1034,8 @@ static void print_declaration_statement( first = false; } - if (entity->kind == ENTITY_TYPEDEF) { - print_typedef(entity); - } else { - assert(is_declaration(entity)); - print_declaration(entity); - } - - fputc('\n', out); + print_entity(entity); + print_string("\n"); } } @@ -1084,9 +1046,9 @@ static void print_declaration_statement( */ static void print_while_statement(const while_statement_t *statement) { - fputs("while (", out); + print_string("while ("); print_expression(statement->condition); - fputs(") ", out); + print_string(") "); print_statement(statement->body); } @@ -1097,12 +1059,12 @@ static void print_while_statement(const while_statement_t *statement) */ static void print_do_while_statement(const do_while_statement_t *statement) { - fputs("do ", out); + print_string("do "); print_statement(statement->body); print_indent(); - fputs("while (", out); + print_string("while ("); print_expression(statement->condition); - fputs(");\n", out); + print_string(");\n"); } /** @@ -1112,34 +1074,29 @@ static void print_do_while_statement(const do_while_statement_t *statement) */ static void print_for_statement(const for_statement_t *statement) { - fputs("for (", out); - entity_t *entity = statement->scope.entities; - while (entity != NULL && is_generated_entity(entity)) - entity = entity->base.next; - - if (entity != NULL) { - assert(statement->initialisation == NULL); - assert(is_declaration(entity)); - print_declaration(entity); - if (entity->base.next != NULL) { - panic("multiple declarations in for statement not supported yet"); - } + print_string("for ("); + if (statement->initialisation != NULL) { + print_expression(statement->initialisation); + print_string(";"); } else { - if (statement->initialisation) { - print_expression(statement->initialisation); + entity_t const *entity = statement->scope.entities; + for (; entity != NULL; entity = entity->base.next) { + if (is_generated_entity(entity)) + continue; + /* FIXME display of multiple declarations is wrong */ + print_declaration(entity); } - fputc(';', out); } if (statement->condition != NULL) { - fputc(' ', out); + print_string(" "); print_expression(statement->condition); } - fputc(';', out); + print_string(";"); if (statement->step != NULL) { - fputc(' ', out); + print_string(" "); print_expression(statement->step); } - fputs(") ", out); + print_string(") "); print_statement(statement->body); } @@ -1153,15 +1110,15 @@ static void print_asm_arguments(asm_argument_t *arguments) asm_argument_t *argument = arguments; for (; argument != NULL; argument = argument->next) { if (argument != arguments) - fputs(", ", out); + print_string(", "); if (argument->symbol) { - fprintf(out, "[%s] ", argument->symbol->string); + print_format("[%s] ", argument->symbol->string); } print_quoted_string(&argument->constraints, '"', 1); - fputs(" (", out); + print_string(" ("); print_expression(argument->expression); - fputc(')', out); + print_string(")"); } } @@ -1175,7 +1132,7 @@ static void print_asm_clobbers(asm_clobber_t *clobbers) asm_clobber_t *clobber = clobbers; for (; clobber != NULL; clobber = clobber->next) { if (clobber != clobbers) - fputs(", ", out); + print_string(", "); print_quoted_string(&clobber->clobber, '"', 1); } @@ -1188,32 +1145,32 @@ static void print_asm_clobbers(asm_clobber_t *clobbers) */ static void print_asm_statement(const asm_statement_t *statement) { - fputs("asm ", out); + print_string("asm "); if (statement->is_volatile) { - fputs("volatile ", out); + print_string("volatile "); } - fputc('(', out); + 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; - fputs(" : ", out); + print_string(" : "); print_asm_arguments(statement->outputs); if (statement->inputs == NULL && statement->clobbers == NULL) goto end_of_print_asm_statement; - fputs(" : ", out); + print_string(" : "); print_asm_arguments(statement->inputs); if (statement->clobbers == NULL) goto end_of_print_asm_statement; - fputs(" : ", out); + print_string(" : "); print_asm_clobbers(statement->clobbers); end_of_print_asm_statement: - fputs(");\n", out); + print_string(");\n"); } /** @@ -1223,15 +1180,15 @@ end_of_print_asm_statement: */ static void print_ms_try_statement(const ms_try_statement_t *statement) { - fputs("__try ", out); + print_string("__try "); print_statement(statement->try_statement); print_indent(); if (statement->except_expression != NULL) { - fputs("__except(", out); + print_string("__except("); print_expression(statement->except_expression); - fputs(") ", out); + print_string(") "); } else { - fputs("__finally ", out); + print_string("__finally "); } print_statement(statement->final_statement); } @@ -1244,7 +1201,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; - fputs("__leave;\n", out); + print_string("__leave;\n"); } /** @@ -1256,7 +1213,7 @@ void print_statement(const statement_t *statement) { switch (statement->kind) { case STATEMENT_EMPTY: - fputs(";\n", out); + print_string(";\n"); break; case STATEMENT_COMPOUND: print_compound_statement(&statement->compound); @@ -1270,17 +1227,14 @@ void print_statement(const statement_t *statement) case STATEMENT_LABEL: print_label_statement(&statement->label); break; - case STATEMENT_LOCAL_LABEL: - print_local_label(&statement->local_label); - break; case STATEMENT_GOTO: print_goto_statement(&statement->gotos); break; case STATEMENT_CONTINUE: - fputs("continue;\n", out); + print_string("continue;\n"); break; case STATEMENT_BREAK: - fputs("break;\n", out); + print_string("break;\n"); break; case STATEMENT_IF: print_if_statement(&statement->ifs); @@ -1313,7 +1267,7 @@ void print_statement(const statement_t *statement) print_leave_statement(&statement->leave); break; case STATEMENT_INVALID: - fputs("$invalid statement$\n", out); + print_string("$invalid statement$\n"); break; } } @@ -1325,16 +1279,15 @@ void print_statement(const statement_t *statement) */ static void print_storage_class(storage_class_tag_t storage_class) { - const char *text; switch (storage_class) { case STORAGE_CLASS_NONE: return; - case STORAGE_CLASS_TYPEDEF: text = "typedef "; break; - case STORAGE_CLASS_EXTERN: text = "extern "; break; - case STORAGE_CLASS_STATIC: text = "static "; break; - case STORAGE_CLASS_AUTO: text = "auto "; break; - case STORAGE_CLASS_REGISTER: text = "register "; break; + case STORAGE_CLASS_TYPEDEF: print_string("typedef "); return; + case STORAGE_CLASS_EXTERN: print_string("extern "); return; + case STORAGE_CLASS_STATIC: print_string("static "); return; + case STORAGE_CLASS_AUTO: print_string("auto "); return; + case STORAGE_CLASS_REGISTER: print_string("register "); return; } - fputs(text, out); + panic("invalid storage class"); } /** @@ -1345,7 +1298,7 @@ static void print_storage_class(storage_class_tag_t storage_class) void print_initializer(const initializer_t *initializer) { if (initializer == NULL) { - fputs("{}", out); + print_string("{}"); return; } @@ -1357,7 +1310,7 @@ void print_initializer(const initializer_t *initializer) } case INITIALIZER_LIST: { assert(initializer->kind == INITIALIZER_LIST); - fputs("{ ", out); + print_string("{ "); const initializer_list_t *list = &initializer->list; for (size_t i = 0 ; i < list->len; ++i) { @@ -1365,10 +1318,10 @@ void print_initializer(const initializer_t *initializer) print_initializer(list->initializers[i]); if (i < list->len-1) { if (sub_init == NULL || sub_init->kind != INITIALIZER_DESIGNATOR) - fputs(", ", out); + print_string(", "); } } - fputs(" }", out); + print_string(" }"); return; } case INITIALIZER_STRING: @@ -1379,13 +1332,14 @@ void print_initializer(const initializer_t *initializer) return; case INITIALIZER_DESIGNATOR: print_designator(initializer->designator.designator); - fputs(" = ", out); + print_string(" = "); return; } panic("invalid initializer kind found"); } +#if 0 /** * Print microsoft extended declaration modifiers. */ @@ -1405,24 +1359,24 @@ static void print_ms_modifiers(const declaration_t *declaration) || variable->get_property_sym != NULL || variable->put_property_sym != NULL) { if (!ds_shown) { - fputs("__declspec", out); + print_string("__declspec"); ds_shown = true; } if (variable->alignment != 0) { - fputs(next, out); next = ", "; fprintf(out, "align(%u)", variable->alignment); + print_string(next); next = ", "; print_format("align(%u)", variable->alignment); } if (variable->get_property_sym != NULL || variable->put_property_sym != NULL) { char *comma = ""; - fputs(next, out); next = ", "; fputs("property(", out); + print_string(next); next = ", "; print_string("property("); if (variable->get_property_sym != NULL) { - fprintf(out, "get=%s", variable->get_property_sym->string); + print_format("get=%s", variable->get_property_sym->string); comma = ", "; } if (variable->put_property_sym != NULL) - fprintf(out, "%sput=%s", comma, variable->put_property_sym->string); - fputc(')', out); + print_format("%sput=%s", comma, variable->put_property_sym->string); + print_string(")"); } } } @@ -1430,53 +1384,54 @@ static void print_ms_modifiers(const declaration_t *declaration) /* DM_FORCEINLINE handled outside. */ if ((modifiers & ~DM_FORCEINLINE) != 0) { if (!ds_shown) { - fputs("__declspec", out); + print_string("__declspec"); ds_shown = true; } if (modifiers & DM_DLLIMPORT) { - fputs(next, out); next = ", "; fputs("dllimport", out); + print_string(next); next = ", "; print_string("dllimport"); } if (modifiers & DM_DLLEXPORT) { - fputs(next, out); next = ", "; fputs("dllexport", out); + print_string(next); next = ", "; print_string("dllexport"); } if (modifiers & DM_THREAD) { - fputs(next, out); next = ", "; fputs("thread", out); + print_string(next); next = ", "; print_string("thread"); } if (modifiers & DM_NAKED) { - fputs(next, out); next = ", "; fputs("naked", out); + print_string(next); next = ", "; print_string("naked"); } if (modifiers & DM_THREAD) { - fputs(next, out); next = ", "; fputs("thread", out); + print_string(next); next = ", "; print_string("thread"); } if (modifiers & DM_SELECTANY) { - fputs(next, out); next = ", "; fputs("selectany", out); + print_string(next); next = ", "; print_string("selectany"); } if (modifiers & DM_NOTHROW) { - fputs(next, out); next = ", "; fputs("nothrow", out); + print_string(next); next = ", "; print_string("nothrow"); } if (modifiers & DM_NORETURN) { - fputs(next, out); next = ", "; fputs("noreturn", out); + print_string(next); next = ", "; print_string("noreturn"); } if (modifiers & DM_NOINLINE) { - fputs(next, out); next = ", "; fputs("noinline", out); + print_string(next); next = ", "; print_string("noinline"); } if (modifiers & DM_DEPRECATED) { - fputs(next, out); next = ", "; fputs("deprecated", out); + print_string(next); next = ", "; print_string("deprecated"); if (declaration->deprecated_string != NULL) - fprintf(out, "(\"%s\")", + print_format("(\"%s\")", declaration->deprecated_string); } if (modifiers & DM_RESTRICT) { - fputs(next, out); next = ", "; fputs("restrict", out); + print_string(next); next = ", "; print_string("restrict"); } if (modifiers & DM_NOALIAS) { - fputs(next, out); next = ", "; fputs("noalias", out); + print_string(next); next = ", "; print_string("noalias"); } } if (ds_shown) - fputs(") ", out); + print_string(") "); } +#endif static void print_scope(const scope_t *scope) { @@ -1484,26 +1439,26 @@ static void print_scope(const scope_t *scope) for ( ; entity != NULL; entity = entity->base.next) { print_indent(); print_entity(entity); - fputs("\n", out); + print_string("\n"); } } static void print_namespace(const namespace_t *namespace) { - fputs("namespace ", out); + print_string("namespace "); if (namespace->base.symbol != NULL) { - fputs(namespace->base.symbol->string, out); - fputc(' ', out); + print_string(namespace->base.symbol->string); + print_string(" "); } - fputs("{\n", out); + print_string("{\n"); ++indent; print_scope(&namespace->members); --indent; print_indent(); - fputs("}\n", out); + print_string("}\n"); } /** @@ -1519,22 +1474,22 @@ void print_declaration(const entity_t *entity) function_t *function = (function_t*)declaration; if (function->is_inline) { if (declaration->modifiers & DM_FORCEINLINE) { - fputs("__forceinline ", out); + print_string("__forceinline "); } else if (declaration->modifiers & DM_MICROSOFT_INLINE) { - fputs("__inline ", out); + print_string("__inline "); } else { - fputs("inline ", out); + print_string("inline "); } } } - print_ms_modifiers(declaration); + //print_ms_modifiers(declaration); switch (entity->kind) { case ENTITY_FUNCTION: print_type_ext(entity->declaration.type, entity->base.symbol, &entity->function.parameters); if (entity->function.statement != NULL) { - fputc('\n', out); + print_string("\n"); print_indent(); print_statement(entity->function.statement); return; @@ -1543,10 +1498,10 @@ void print_declaration(const entity_t *entity) case ENTITY_VARIABLE: if (entity->variable.thread_local) - fputs("__thread ", out); + print_string("__thread "); print_type_ext(declaration->type, declaration->base.symbol, NULL); if (entity->variable.initializer != NULL) { - fputs(" = ", out); + print_string(" = "); print_initializer(entity->variable.initializer); } break; @@ -1555,7 +1510,7 @@ void print_declaration(const entity_t *entity) print_type_ext(declaration->type, declaration->base.symbol, NULL); break; } - fputc(';', out); + print_string(";"); } /** @@ -1582,45 +1537,53 @@ void print_entity(const entity_t *entity) case ENTITY_VARIABLE: case ENTITY_PARAMETER: case ENTITY_COMPOUND_MEMBER: - print_declaration(entity); - return; case ENTITY_FUNCTION: print_declaration(entity); return; case ENTITY_TYPEDEF: print_typedef(entity); return; + case ENTITY_CLASS: + /* TODO */ + print_string("class "); + print_string(entity->base.symbol->string); + print_string("; /* TODO */\n"); + return; case ENTITY_STRUCT: - fputs("struct ", out); - fputs(entity->base.symbol->string, out); + print_string("struct "); + print_string(entity->base.symbol->string); if (entity->structe.complete) { - fputc(' ', out); + print_string(" "); print_compound_definition(&entity->structe); } - fputc(';', out); + print_string(";"); return; case ENTITY_UNION: - fputs("union ", out); - fputs(entity->base.symbol->string, out); + print_string("union "); + print_string(entity->base.symbol->string); if (entity->unione.complete) { - fputc(' ', out); + print_string(" "); print_compound_definition(&entity->unione); } - fputc(';', out); + print_string(";"); return; case ENTITY_ENUM: - fputs("enum ", out); - fputs(entity->base.symbol->string, out); - fputc(' ', out); + print_string("enum "); + print_string(entity->base.symbol->string); + print_string(" "); print_enum_definition(&entity->enume); - fputc(';', out); + print_string(";"); return; case ENTITY_NAMESPACE: print_namespace(&entity->namespacee); return; + case ENTITY_LOCAL_LABEL: + print_string("__label__ "); + print_string(entity->base.symbol->string); + print_string(";"); + return; case ENTITY_LABEL: case ENTITY_ENUM_VALUE: - case ENTITY_LOCAL_LABEL: panic("print_entity used on unexpected entity type"); case ENTITY_INVALID: break; @@ -1635,8 +1598,6 @@ void print_entity(const entity_t *entity) */ void print_ast(const translation_unit_t *unit) { - inc_type_visited(); - entity_t *entity = unit->scope.entities; for ( ; entity != NULL; entity = entity->base.next) { if (entity->kind == ENTITY_ENUM_VALUE) @@ -1649,7 +1610,7 @@ void print_ast(const translation_unit_t *unit) print_indent(); print_entity(entity); - fputc('\n', out); + print_string("\n"); } } @@ -1723,6 +1684,12 @@ static bool is_object_with_linker_constant_address(const expression_t *expressio bool is_address_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 true; + case EXPR_UNARY_TAKE_ADDRESS: return is_object_with_linker_constant_address(expression->unary.value); @@ -1789,32 +1756,50 @@ bool is_address_constant(const expression_t *expression) is_address_constant(expression->array_access.array_ref); } + case EXPR_CONDITIONAL: { + expression_t *const c = expression->conditional.condition; + if (!is_constant_expression(c)) + return false; + + if (fold_constant_to_bool(c)) { + expression_t const *const t = expression->conditional.true_expression; + return is_address_constant(t != NULL ? t : c); + } else { + return is_address_constant(expression->conditional.false_expression); + } + } + default: return false; } } +/** + * Check if the given expression is a call to a builtin function + * returning a constant result. + */ static bool is_builtin_const_call(const expression_t *expression) { expression_t *function = expression->call.function; - if (function->kind != EXPR_BUILTIN_SYMBOL) { + if (function->kind != EXPR_REFERENCE) + return false; + reference_expression_t *ref = &function->reference; + if (ref->entity->kind != ENTITY_FUNCTION) return false; - } - - symbol_t *symbol = function->builtin_symbol.symbol; - switch (symbol->ID) { - case T___builtin_huge_val: - case T___builtin_inf: - case T___builtin_inff: - case T___builtin_infl: - case T___builtin_nan: - case T___builtin_nanf: - case T___builtin_nanl: + switch (ref->entity->function.btk) { + case bk_gnu_builtin_huge_val: + 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: return true; + default: + return false; } - return false; } static bool is_constant_pointer(const expression_t *expression) @@ -1868,33 +1853,27 @@ bool is_constant_expression(const expression_t *expression) case EXPR_CONST: case EXPR_CHARACTER_CONSTANT: case EXPR_WIDE_CHARACTER_CONSTANT: - case EXPR_STRING_LITERAL: - case EXPR_WIDE_STRING_LITERAL: case EXPR_CLASSIFY_TYPE: - case EXPR_FUNCNAME: case EXPR_OFFSETOF: case EXPR_ALIGNOF: case EXPR_BUILTIN_CONSTANT_P: - case EXPR_LABEL_ADDRESS: + case EXPR_BUILTIN_TYPES_COMPATIBLE_P: case EXPR_REFERENCE_ENUM_VALUE: return true; case EXPR_SIZEOF: { - type_t *type = expression->typeprop.type; - if (type == NULL) - type = expression->typeprop.tp_expression->base.type; - - type = skip_typeref(type); - if (is_type_array(type) && type->array.is_vla) - return false; - return true; + type_t *const type = skip_typeref(expression->typeprop.type); + return !is_type_array(type) || !type->array.is_vla; } - case EXPR_BUILTIN_SYMBOL: - case EXPR_BUILTIN_PREFETCH: + case EXPR_STRING_LITERAL: + case EXPR_WIDE_STRING_LITERAL: + case EXPR_FUNCNAME: + case EXPR_LABEL_ADDRESS: case EXPR_SELECT: case EXPR_VA_START: case EXPR_VA_ARG: + case EXPR_VA_COPY: case EXPR_STATEMENT: case EXPR_REFERENCE: case EXPR_UNARY_POSTFIX_INCREMENT: @@ -1952,8 +1931,6 @@ bool is_constant_expression(const expression_t *expression) case EXPR_BINARY_BITWISE_AND: case EXPR_BINARY_BITWISE_OR: case EXPR_BINARY_BITWISE_XOR: - case EXPR_BINARY_LOGICAL_AND: - case EXPR_BINARY_LOGICAL_OR: case EXPR_BINARY_SHIFTLEFT: case EXPR_BINARY_SHIFTRIGHT: case EXPR_BINARY_ISGREATER: @@ -1965,6 +1942,24 @@ bool is_constant_expression(const expression_t *expression) return is_constant_expression(expression->binary.left) && is_constant_expression(expression->binary.right); + case EXPR_BINARY_LOGICAL_AND: { + expression_t const *const left = expression->binary.left; + if (!is_constant_expression(left)) + return false; + if (fold_constant_to_bool(left) == false) + return true; + return is_constant_expression(expression->binary.right); + } + + case EXPR_BINARY_LOGICAL_OR: { + expression_t const *const left = expression->binary.left; + if (!is_constant_expression(left)) + return false; + if (fold_constant_to_bool(left) == true) + return true; + return is_constant_expression(expression->binary.right); + } + case EXPR_COMPOUND_LITERAL: return is_constant_initializer(expression->compound_literal.initializer); @@ -1973,11 +1968,12 @@ bool is_constant_expression(const expression_t *expression) if (!is_constant_expression(condition)) return false; - long val = fold_constant(condition); - if (val != 0) - return is_constant_expression(expression->conditional.true_expression); - else + if (fold_constant_to_bool(condition) == true) { + expression_t const *const t = expression->conditional.true_expression; + return t == NULL || is_constant_expression(t); + } else { return is_constant_expression(expression->conditional.false_expression); + } } case EXPR_INVALID: @@ -2005,17 +2001,6 @@ void exit_ast(void) obstack_free(&ast_obstack, NULL); } -/** - * Set the output stream for the AST printer. - * - * @param stream the output stream - */ -void ast_set_output(FILE *stream) -{ - out = stream; - type_set_output(stream); -} - /** * Allocate an AST object of the given size. *