X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast.c;h=736160810ba90bdda3c290e88e8027075f338237;hb=f56ee1a34627fb21c5909086f3597c76ce9583be;hp=060aa6c0b4d3c5e1937f13b0c962f3c06d0c5e5b;hpb=67376adac7ca7957f9dd0cc33956d647e1e61000;p=cparser diff --git a/ast.c b/ast.c index 060aa6c..7361608 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 @@ -24,29 +24,31 @@ #include "type_t.h" #include "parser.h" #include "lang_features.h" +#include "entity_t.h" +#include "printer.h" +#include "types.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; - -/** If set parenthesis are printed to indicate operator precedence. */ bool print_parenthesis = false; static void print_statement(const statement_t *statement); @@ -61,40 +63,38 @@ void change_indent(int delta) void print_indent(void) { for (int i = 0; i < indent; ++i) - fputc('\t', out); -} - -enum precedence_t { - PREC_BOTTOM = 0, - 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 -}; + print_string("\t"); +} + +static void print_symbol(const symbol_t *symbol) +{ + print_string(symbol->string); +} + +static void print_stringrep(const string_t *string) +{ + for (size_t i = 0; i < string->size; ++i) { + print_char(string->begin[i]); + } +} /** * Returns 1 if a given precedence level has right-to-left - * associativity, else -1. + * associativity, else 0. * * @param precedence the operator precedence */ -static int right_to_left(unsigned precedence) { - return (precedence == PREC_ASSIGN || precedence == PREC_COND || - precedence == PREC_UNARY) ? 1 : -1; +static int right_to_left(unsigned precedence) +{ + switch (precedence) { + case PREC_ASSIGNMENT: + case PREC_CONDITIONAL: + case PREC_UNARY: + return 1; + + default: + return 0; + } } /** @@ -105,137 +105,101 @@ static int right_to_left(unsigned precedence) { static unsigned get_expression_precedence(expression_kind_t kind) { static const unsigned prec[] = { - [EXPR_UNKNOWN] = PREC_PRIM, - [EXPR_INVALID] = PREC_PRIM, - [EXPR_REFERENCE] = PREC_PRIM, - [EXPR_CHARACTER_CONSTANT] = PREC_PRIM, - [EXPR_WIDE_CHARACTER_CONSTANT] = PREC_PRIM, - [EXPR_CONST] = PREC_PRIM, - [EXPR_STRING_LITERAL] = PREC_PRIM, - [EXPR_WIDE_STRING_LITERAL] = PREC_PRIM, - [EXPR_COMPOUND_LITERAL] = PREC_UNARY, - [EXPR_CALL] = PREC_ACCESS, - [EXPR_CONDITIONAL] = PREC_COND, - [EXPR_SELECT] = PREC_ACCESS, - [EXPR_ARRAY_ACCESS] = PREC_ACCESS, - [EXPR_SIZEOF] = PREC_UNARY, - [EXPR_CLASSIFY_TYPE] = PREC_UNARY, - [EXPR_ALIGNOF] = PREC_UNARY, - - [EXPR_FUNCNAME] = PREC_PRIM, - [EXPR_BUILTIN_SYMBOL] = PREC_PRIM, - [EXPR_BUILTIN_CONSTANT_P] = PREC_PRIM, - [EXPR_BUILTIN_PREFETCH] = PREC_PRIM, - [EXPR_OFFSETOF] = PREC_PRIM, - [EXPR_VA_START] = PREC_PRIM, - [EXPR_VA_ARG] = PREC_PRIM, - [EXPR_STATEMENT] = PREC_ACCESS, - [EXPR_LABEL_ADDRESS] = PREC_PRIM, - - [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_UNARY, - [EXPR_UNARY_POSTFIX_DECREMENT] = PREC_UNARY, - [EXPR_UNARY_PREFIX_INCREMENT] = PREC_UNARY, - [EXPR_UNARY_PREFIX_DECREMENT] = PREC_UNARY, - [EXPR_UNARY_CAST] = PREC_UNARY, - [EXPR_UNARY_CAST_IMPLICIT] = PREC_UNARY, - [EXPR_UNARY_ASSUME] = PREC_PRIM, - - [EXPR_BINARY_ADD] = PREC_PLUS, - [EXPR_BINARY_SUB] = PREC_PLUS, - [EXPR_BINARY_MUL] = PREC_MUL, - [EXPR_BINARY_DIV] = PREC_MUL, - [EXPR_BINARY_MOD] = PREC_MUL, - [EXPR_BINARY_EQUAL] = PREC_EQ, - [EXPR_BINARY_NOTEQUAL] = PREC_EQ, - [EXPR_BINARY_LESS] = PREC_CMP, - [EXPR_BINARY_LESSEQUAL] = PREC_CMP, - [EXPR_BINARY_GREATER] = PREC_CMP, - [EXPR_BINARY_GREATEREQUAL] = PREC_CMP, - [EXPR_BINARY_BITWISE_AND] = PREC_BIT_AND, - [EXPR_BINARY_BITWISE_OR] = PREC_BIT_OR, - [EXPR_BINARY_BITWISE_XOR] = PREC_BIT_XOR, - [EXPR_BINARY_LOGICAL_AND] = PREC_LOG_AND, - [EXPR_BINARY_LOGICAL_OR] = PREC_LOG_OR, - [EXPR_BINARY_SHIFTLEFT] = PREC_SHF, - [EXPR_BINARY_SHIFTRIGHT] = PREC_SHF, - [EXPR_BINARY_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_MUL_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_DIV_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_MOD_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_ADD_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_SUB_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_SHIFTLEFT_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_SHIFTRIGHT_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_BITWISE_AND_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_BITWISE_XOR_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_BITWISE_OR_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_COMMA] = PREC_COMMA, - - [EXPR_BINARY_BUILTIN_EXPECT] = PREC_PRIM, - [EXPR_BINARY_ISGREATER] = PREC_PRIM, - [EXPR_BINARY_ISGREATEREQUAL] = PREC_PRIM, - [EXPR_BINARY_ISLESS] = PREC_PRIM, - [EXPR_BINARY_ISLESSEQUAL] = PREC_PRIM, - [EXPR_BINARY_ISLESSGREATER] = PREC_PRIM, - [EXPR_BINARY_ISUNORDERED] = PREC_PRIM + [EXPR_UNKNOWN] = PREC_PRIMARY, + [EXPR_INVALID] = PREC_PRIMARY, + [EXPR_REFERENCE] = PREC_PRIMARY, + [EXPR_REFERENCE_ENUM_VALUE] = PREC_PRIMARY, + [EXPR_LITERAL_INTEGER] = PREC_PRIMARY, + [EXPR_LITERAL_INTEGER_OCTAL] = PREC_PRIMARY, + [EXPR_LITERAL_INTEGER_HEXADECIMAL] = PREC_PRIMARY, + [EXPR_LITERAL_FLOATINGPOINT] = PREC_PRIMARY, + [EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL] = PREC_PRIMARY, + [EXPR_LITERAL_CHARACTER] = PREC_PRIMARY, + [EXPR_LITERAL_WIDE_CHARACTER] = PREC_PRIMARY, + [EXPR_LITERAL_MS_NOOP] = PREC_PRIMARY, + [EXPR_STRING_LITERAL] = PREC_PRIMARY, + [EXPR_WIDE_STRING_LITERAL] = PREC_PRIMARY, + [EXPR_COMPOUND_LITERAL] = PREC_UNARY, + [EXPR_CALL] = PREC_POSTFIX, + [EXPR_CONDITIONAL] = PREC_CONDITIONAL, + [EXPR_SELECT] = PREC_POSTFIX, + [EXPR_ARRAY_ACCESS] = PREC_POSTFIX, + [EXPR_SIZEOF] = PREC_UNARY, + [EXPR_CLASSIFY_TYPE] = PREC_UNARY, + [EXPR_ALIGNOF] = PREC_UNARY, + + [EXPR_FUNCNAME] = PREC_PRIMARY, + [EXPR_BUILTIN_CONSTANT_P] = PREC_PRIMARY, + [EXPR_BUILTIN_TYPES_COMPATIBLE_P] = PREC_PRIMARY, + [EXPR_OFFSETOF] = PREC_PRIMARY, + [EXPR_VA_START] = PREC_PRIMARY, + [EXPR_VA_ARG] = PREC_PRIMARY, + [EXPR_VA_COPY] = PREC_PRIMARY, + [EXPR_STATEMENT] = PREC_PRIMARY, + [EXPR_LABEL_ADDRESS] = PREC_PRIMARY, + + [EXPR_UNARY_NEGATE] = PREC_UNARY, + [EXPR_UNARY_PLUS] = PREC_UNARY, + [EXPR_UNARY_BITWISE_NEGATE] = PREC_UNARY, + [EXPR_UNARY_NOT] = PREC_UNARY, + [EXPR_UNARY_DEREFERENCE] = PREC_UNARY, + [EXPR_UNARY_TAKE_ADDRESS] = PREC_UNARY, + [EXPR_UNARY_POSTFIX_INCREMENT] = PREC_POSTFIX, + [EXPR_UNARY_POSTFIX_DECREMENT] = PREC_POSTFIX, + [EXPR_UNARY_PREFIX_INCREMENT] = PREC_UNARY, + [EXPR_UNARY_PREFIX_DECREMENT] = PREC_UNARY, + [EXPR_UNARY_CAST] = PREC_UNARY, + [EXPR_UNARY_CAST_IMPLICIT] = PREC_UNARY, + [EXPR_UNARY_ASSUME] = PREC_PRIMARY, + [EXPR_UNARY_DELETE] = PREC_UNARY, + [EXPR_UNARY_DELETE_ARRAY] = PREC_UNARY, + [EXPR_UNARY_THROW] = PREC_ASSIGNMENT, + + [EXPR_BINARY_ADD] = PREC_ADDITIVE, + [EXPR_BINARY_SUB] = PREC_ADDITIVE, + [EXPR_BINARY_MUL] = PREC_MULTIPLICATIVE, + [EXPR_BINARY_DIV] = PREC_MULTIPLICATIVE, + [EXPR_BINARY_MOD] = PREC_MULTIPLICATIVE, + [EXPR_BINARY_EQUAL] = PREC_EQUALITY, + [EXPR_BINARY_NOTEQUAL] = PREC_EQUALITY, + [EXPR_BINARY_LESS] = PREC_RELATIONAL, + [EXPR_BINARY_LESSEQUAL] = PREC_RELATIONAL, + [EXPR_BINARY_GREATER] = PREC_RELATIONAL, + [EXPR_BINARY_GREATEREQUAL] = PREC_RELATIONAL, + [EXPR_BINARY_BITWISE_AND] = PREC_AND, + [EXPR_BINARY_BITWISE_OR] = PREC_OR, + [EXPR_BINARY_BITWISE_XOR] = PREC_XOR, + [EXPR_BINARY_LOGICAL_AND] = PREC_LOGICAL_AND, + [EXPR_BINARY_LOGICAL_OR] = PREC_LOGICAL_OR, + [EXPR_BINARY_SHIFTLEFT] = PREC_SHIFT, + [EXPR_BINARY_SHIFTRIGHT] = PREC_SHIFT, + [EXPR_BINARY_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_MUL_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_DIV_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_MOD_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_ADD_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_SUB_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_SHIFTLEFT_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_SHIFTRIGHT_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_BITWISE_AND_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_BITWISE_XOR_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_BITWISE_OR_ASSIGN] = PREC_ASSIGNMENT, + [EXPR_BINARY_COMMA] = PREC_EXPRESSION, + + [EXPR_BINARY_ISGREATER] = PREC_PRIMARY, + [EXPR_BINARY_ISGREATEREQUAL] = PREC_PRIMARY, + [EXPR_BINARY_ISLESS] = PREC_PRIMARY, + [EXPR_BINARY_ISLESSEQUAL] = PREC_PRIMARY, + [EXPR_BINARY_ISLESSGREATER] = PREC_PRIMARY, + [EXPR_BINARY_ISUNORDERED] = PREC_PRIMARY }; - assert((unsigned)kind < (sizeof(prec)/sizeof(prec[0]))); + assert((size_t)kind < lengthof(prec)); unsigned res = prec[kind]; assert(res != PREC_BOTTOM); return res; } -/** - * Print a constant expression. - * - * @param cnst the constant expression - */ -static void print_const(const const_expression_t *cnst) -{ - if(cnst->base.type == NULL) - return; - - const type_t *const type = skip_typeref(cnst->base.type); - - if (is_type_integer(type)) { - fprintf(out, "%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); -#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); -} - /** * Print a quoted string constant. * @@ -243,157 +207,110 @@ static void print_const(const const_expression_t *cnst) * @param border the border char * @param skip number of chars to skip at the end */ -static void print_quoted_string(const string_t *const string, char border, int skip) +static void print_quoted_string(const string_t *const string, char border, + 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); + const char 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*/ + /* FALLTHROUGH */ default: - if(!isprint(*c)) { - fprintf(out, "\\%03o", *c); - break; + if ((unsigned)tc < 0x80 && !isprint(tc)) { + print_format("\\%03o", (unsigned)tc); + } else { + print_char(tc); } - fputc(*c, out); break; } } - fputc(border, out); -} - -/** - * Prints a wide string literal expression. - * - * @param wstr the wide string literal expression - * @param border the border char - * @param skip number of chars to skip at the end - */ -static void print_quoted_wide_string(const wide_string_t *const wstr, - char border, int skip) -{ - 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; - 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 27: - if (c_mode & _GNUC) { - fputs("\\e", out); break; - } - /*fallthrough*/ - default: { - const unsigned tc = *c; - if (tc < 0x80U) { - if (!isprint(*c)) { - fprintf(out, "\\%03o", (char)*c); - } else { - fputc(*c, out); - } - } 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); - } - } - } - } - 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); + print_char(border); } -static void print_wide_character_constant(const const_expression_t *cnst) +static void print_string_literal(const string_literal_expression_t *literal) { - print_quoted_wide_string(&cnst->v.wide_character, '\'', 0); + if (literal->base.kind == EXPR_WIDE_STRING_LITERAL) { + print_char('L'); + } + print_quoted_string(&literal->value, '"', 1); } -/** - * Prints a string literal expression. - * - * @param string_literal the string literal expression - */ -static void print_string_literal( - const string_literal_expression_t *string_literal) +static void print_literal(const literal_expression_t *literal) { - print_quoted_string(&string_literal->value, '"', 1); + switch (literal->base.kind) { + case EXPR_LITERAL_MS_NOOP: + print_string("__noop"); + return; + case EXPR_LITERAL_INTEGER_HEXADECIMAL: + case EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL: + print_string("0x"); + /* FALLTHROUGH */ + case EXPR_LITERAL_BOOLEAN: + case EXPR_LITERAL_INTEGER: + case EXPR_LITERAL_INTEGER_OCTAL: + case EXPR_LITERAL_FLOATINGPOINT: + print_stringrep(&literal->value); + if (literal->suffix != NULL) + print_symbol(literal->suffix); + return; + case EXPR_LITERAL_WIDE_CHARACTER: + print_char('L'); + /* FALLTHROUGH */ + case EXPR_LITERAL_CHARACTER: + print_quoted_string(&literal->value, '\'', 0); + return; + default: + break; + } + print_string("INVALID LITERAL KIND"); } /** * Prints a predefined symbol. */ -static void print_funcname( - const funcname_expression_t *funcname) +static void print_funcname(const funcname_expression_t *funcname) { const char *s = ""; - switch(funcname->kind) { + switch (funcname->kind) { case FUNCNAME_FUNCTION: s = (c_mode & _C99) ? "__func__" : "__FUNCTION__"; break; case FUNCNAME_PRETTY_FUNCTION: s = "__PRETTY_FUNCTION__"; break; case FUNCNAME_FUNCSIG: s = "__FUNCSIG__"; break; case FUNCNAME_FUNCDNAME: s = "__FUNCDNAME__"; break; } - fputc('"', out); - fputs(s, out); - fputc('"', out); -} - -static void print_wide_string_literal( - const wide_string_literal_expression_t *const wstr) -{ - print_quoted_wide_string(&wstr->value, '"', 1); + print_string(s); } static void print_compound_literal( const compound_literal_expression_t *expression) { - fputc('(', out); + print_string("("); print_type(expression->type); - fputs(") ", out); + print_string(")"); print_initializer(expression->initializer); } +static void print_assignment_expression(const expression_t *const expr) +{ + print_expression_prec(expr, PREC_ASSIGNMENT); +} + /** * Prints a call expression. * @@ -401,22 +318,21 @@ static void print_compound_literal( */ 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); + while (argument != NULL) { + if (!first) { + print_string(", "); } else { first = 0; } - print_expression_prec(argument->expression, PREC_COMMA + 1); + print_assignment_expression(argument->expression); argument = argument->next; } - fputc(')', out); + print_string(")"); } /** @@ -429,55 +345,44 @@ static void print_binary_expression(const binary_expression_t *binexpr) unsigned prec = get_expression_precedence(binexpr->base.kind); int r2l = right_to_left(prec); - if(binexpr->base.kind == EXPR_BINARY_BUILTIN_EXPECT) { - fputs("__builtin_expect(", out); - print_expression_prec(binexpr->left, prec); - fputs(", ", out); - print_expression_prec(binexpr->right, prec); - fputc(')', out); - return; - } - print_expression_prec(binexpr->left, prec + r2l); - if (binexpr->base.kind != EXPR_BINARY_COMMA) { - fputc(' ', out); - } + char const* op; switch (binexpr->base.kind) { - case EXPR_BINARY_COMMA: fputs(",", out); break; - case EXPR_BINARY_ASSIGN: fputs("=", out); break; - case EXPR_BINARY_ADD: fputs("+", out); break; - case EXPR_BINARY_SUB: fputs("-", out); break; - case EXPR_BINARY_MUL: fputs("*", out); break; - case EXPR_BINARY_MOD: fputs("%", out); break; - case EXPR_BINARY_DIV: fputs("/", out); break; - case EXPR_BINARY_BITWISE_OR: fputs("|", out); break; - case EXPR_BINARY_BITWISE_AND: fputs("&", out); break; - case EXPR_BINARY_BITWISE_XOR: fputs("^", out); break; - case EXPR_BINARY_LOGICAL_OR: fputs("||", out); break; - case EXPR_BINARY_LOGICAL_AND: fputs("&&", out); break; - case EXPR_BINARY_NOTEQUAL: fputs("!=", out); break; - case EXPR_BINARY_EQUAL: fputs("==", out); break; - case EXPR_BINARY_LESS: fputs("<", out); break; - case EXPR_BINARY_LESSEQUAL: fputs("<=", out); break; - case EXPR_BINARY_GREATER: fputs(">", out); break; - case EXPR_BINARY_GREATEREQUAL: fputs(">=", out); break; - case EXPR_BINARY_SHIFTLEFT: fputs("<<", out); break; - case EXPR_BINARY_SHIFTRIGHT: fputs(">>", out); break; - - case EXPR_BINARY_ADD_ASSIGN: fputs("+=", out); break; - case EXPR_BINARY_SUB_ASSIGN: fputs("-=", out); break; - case EXPR_BINARY_MUL_ASSIGN: fputs("*=", out); break; - case EXPR_BINARY_MOD_ASSIGN: fputs("%=", out); break; - case EXPR_BINARY_DIV_ASSIGN: fputs("/=", out); break; - case EXPR_BINARY_BITWISE_OR_ASSIGN: fputs("|=", out); break; - case EXPR_BINARY_BITWISE_AND_ASSIGN: fputs("&=", out); break; - case EXPR_BINARY_BITWISE_XOR_ASSIGN: fputs("^=", out); break; - case EXPR_BINARY_SHIFTLEFT_ASSIGN: fputs("<<=", out); break; - case EXPR_BINARY_SHIFTRIGHT_ASSIGN: fputs(">>=", out); break; + case EXPR_BINARY_COMMA: op = ", "; break; + case EXPR_BINARY_ASSIGN: op = " = "; break; + case EXPR_BINARY_ADD: op = " + "; break; + case EXPR_BINARY_SUB: op = " - "; break; + case EXPR_BINARY_MUL: op = " * "; break; + case EXPR_BINARY_MOD: op = " % "; break; + case EXPR_BINARY_DIV: op = " / "; break; + case EXPR_BINARY_BITWISE_OR: op = " | "; break; + case EXPR_BINARY_BITWISE_AND: op = " & "; break; + case EXPR_BINARY_BITWISE_XOR: op = " ^ "; break; + case EXPR_BINARY_LOGICAL_OR: op = " || "; break; + case EXPR_BINARY_LOGICAL_AND: op = " && "; break; + case EXPR_BINARY_NOTEQUAL: op = " != "; break; + case EXPR_BINARY_EQUAL: op = " == "; break; + case EXPR_BINARY_LESS: op = " < "; break; + case EXPR_BINARY_LESSEQUAL: op = " <= "; break; + case EXPR_BINARY_GREATER: op = " > "; break; + case EXPR_BINARY_GREATEREQUAL: op = " >= "; break; + case EXPR_BINARY_SHIFTLEFT: op = " << "; break; + case EXPR_BINARY_SHIFTRIGHT: op = " >> "; break; + + case EXPR_BINARY_ADD_ASSIGN: op = " += "; break; + case EXPR_BINARY_SUB_ASSIGN: op = " -= "; break; + case EXPR_BINARY_MUL_ASSIGN: op = " *= "; break; + case EXPR_BINARY_MOD_ASSIGN: op = " %= "; break; + case EXPR_BINARY_DIV_ASSIGN: op = " /= "; break; + case EXPR_BINARY_BITWISE_OR_ASSIGN: op = " |= "; break; + case EXPR_BINARY_BITWISE_AND_ASSIGN: op = " &= "; break; + case EXPR_BINARY_BITWISE_XOR_ASSIGN: op = " ^= "; break; + case EXPR_BINARY_SHIFTLEFT_ASSIGN: op = " <<= "; break; + case EXPR_BINARY_SHIFTRIGHT_ASSIGN: op = " >>= "; break; default: panic("invalid binexpression found"); } - fputc(' ', out); - print_expression_prec(binexpr->right, prec - r2l); + print_string(op); + print_expression_prec(binexpr->right, prec + 1 - r2l); } /** @@ -488,35 +393,46 @@ static void print_binary_expression(const binary_expression_t *binexpr) static void print_unary_expression(const unary_expression_t *unexpr) { unsigned prec = get_expression_precedence(unexpr->base.kind); - switch(unexpr->base.kind) { - case EXPR_UNARY_NEGATE: 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; + switch (unexpr->base.kind) { + case EXPR_UNARY_NEGATE: print_string("-"); break; + case EXPR_UNARY_PLUS: print_string("+"); break; + case EXPR_UNARY_NOT: print_string("!"); break; + case EXPR_UNARY_BITWISE_NEGATE: print_string("~"); break; + case EXPR_UNARY_PREFIX_INCREMENT: print_string("++"); break; + case EXPR_UNARY_PREFIX_DECREMENT: print_string("--"); break; + case EXPR_UNARY_DEREFERENCE: print_string("*"); break; + case EXPR_UNARY_TAKE_ADDRESS: print_string("&"); break; + case EXPR_UNARY_DELETE: print_string("delete "); break; + case EXPR_UNARY_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_expression_prec(unexpr->value, PREC_COMMA + 1); - fputc(')', out); + print_string("__assume("); + print_assignment_expression(unexpr->value); + print_string(")"); return; + + case EXPR_UNARY_THROW: + if (unexpr->value == NULL) { + print_string("throw"); + return; + } + print_string("throw "); + break; + default: panic("invalid unary expression found"); } @@ -530,7 +446,7 @@ static void print_unary_expression(const unary_expression_t *unexpr) */ static void print_reference_expression(const reference_expression_t *ref) { - fputs(ref->declaration->symbol->string, out); + print_string(ref->entity->base.symbol->string); } /** @@ -540,7 +456,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->declaration->symbol->string); + print_format("&&%s", le->label->base.symbol->string); } /** @@ -550,17 +466,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->index, PREC_BOTTOM); - fputc(']', out); + if (!expression->flipped) { + print_expression_prec(expression->array_ref, PREC_POSTFIX); + print_string("["); + print_expression(expression->index); + print_string("]"); } else { - print_expression_prec(expression->index, prec); - fputc('[', out); - print_expression_prec(expression->array_ref, PREC_BOTTOM); - fputc(']', out); + print_expression_prec(expression->index, PREC_POSTFIX); + print_string("["); + print_expression(expression->array_ref); + print_string("]"); } } @@ -572,33 +487,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_prec(expression->tp_expression, PREC_ACCESS); - fputc(')', out); + if (expression->tp_expression != NULL) { + /* PREC_TOP: always print the '()' here, sizeof x is right but unusual */ + print_expression_prec(expression->tp_expression, PREC_TOP); } else { - fputc('(', out); + print_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. * @@ -606,29 +509,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_expression_prec(expression->value, PREC_COMMA + 1); - fputc(')', out); + print_string("__builtin_constant_p("); + print_assignment_expression(expression->value); + 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_expression_prec(expression->adr, PREC_COMMA + 1); - if (expression->rw) { - fputc(',', out); - print_expression_prec(expression->rw, PREC_COMMA + 1); - } - if (expression->locality) { - fputc(',', out); - print_expression_prec(expression->locality, PREC_COMMA + 1); - } - fputc(')', out); + print_string("__builtin_types_compatible_p("); + print_type(expression->left); + print_string(", "); + print_type(expression->right); + print_string(")"); } /** @@ -638,15 +536,16 @@ 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_LOG_OR); - fputs(" ? ", out); + print_expression_prec(expression->condition, PREC_LOGICAL_OR); if (expression->true_expression != NULL) { - print_expression_prec(expression->true_expression, PREC_EXPR); - fputs(" : ", out); + print_string(" ? "); + print_expression_prec(expression->true_expression, PREC_EXPRESSION); + print_string(" : "); } else { - fputs(": ", out); + print_string(" ?: "); } - print_expression_prec(expression->false_expression, PREC_COND); + precedence_t prec = c_mode & _CXX ? PREC_ASSIGNMENT : PREC_CONDITIONAL; + print_expression_prec(expression->false_expression, prec); } /** @@ -656,11 +555,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_expression_prec(expression->ap, PREC_COMMA + 1); - fputs(", ", out); - fputs(expression->parameter->symbol->string, out); - fputs(")", out); + print_string("__builtin_va_start("); + print_assignment_expression(expression->ap); + print_string(", "); + print_string(expression->parameter->base.base.symbol->string); + print_string(")"); } /** @@ -670,11 +569,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_expression_prec(expression->ap, PREC_COMMA + 1); - fputs(", ", out); + print_string("__builtin_va_arg("); + print_assignment_expression(expression->ap); + print_string(", "); print_type(expression->base.type); - fputs(")", 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(")"); } /** @@ -684,14 +597,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); - if(is_type_pointer(skip_typeref(expression->compound->base.type))) { - fputs("->", out); + print_expression_prec(expression->compound, PREC_POSTFIX); + if (is_type_pointer(skip_typeref(expression->compound->base.type))) { + print_string("->"); } else { - fputc('.', out); + print_string("."); } - fputs(expression->compound_entry->symbol->string, out); + print_string(expression->compound_entry->base.symbol->string); } /** @@ -702,9 +614,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_expression_prec(expr->type_expression, PREC_COMMA + 1); - fputc(')', out); + print_string("__builtin_classify_type("); + print_assignment_expression(expr->type_expression); + print_string(")"); } /** @@ -716,12 +628,12 @@ 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_BOTTOM); - fputc(']', out); + print_string("["); + print_expression(designator->array_index); + print_string("]"); } else { - fputc('.', out); - fputs(designator->symbol->string, out); + print_string("."); + print_string(designator->symbol->string); } } } @@ -733,12 +645,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(")"); } /** @@ -748,9 +659,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(")"); } /** @@ -764,34 +675,29 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p if (expression->kind == EXPR_UNARY_CAST_IMPLICIT && !print_implicit_casts) { expression = expression->unary.value; } - unsigned prec = get_expression_precedence(expression->base.kind); - if (print_parenthesis && top_prec != PREC_BOTTOM) - top_prec = PREC_TOP; - if (top_prec > prec) - fputc('(', out); - switch(expression->kind) { + + bool parenthesized = + expression->base.parenthesized || + (print_parenthesis && top_prec != PREC_BOTTOM) || + top_prec > get_expression_precedence(expression->base.kind); + + if (parenthesized) + print_string("("); + switch (expression->kind) { case EXPR_UNKNOWN: case EXPR_INVALID: - fputs("$invalid expression$", out); - break; - case EXPR_CHARACTER_CONSTANT: - print_character_constant(&expression->conste); + print_string("$invalid expression$"); break; - case EXPR_WIDE_CHARACTER_CONSTANT: - print_wide_character_constant(&expression->conste); + case EXPR_WIDE_STRING_LITERAL: + case EXPR_STRING_LITERAL: + print_string_literal(&expression->string_literal); break; - case EXPR_CONST: - print_const(&expression->conste); + EXPR_LITERAL_CASES + print_literal(&expression->literal); break; case EXPR_FUNCNAME: print_funcname(&expression->funcname); break; - case EXPR_STRING_LITERAL: - print_string_literal(&expression->string); - break; - case EXPR_WIDE_STRING_LITERAL: - print_wide_string_literal(&expression->wide_string); - break; case EXPR_COMPOUND_LITERAL: print_compound_literal(&expression->compound_literal); break; @@ -802,6 +708,7 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p print_binary_expression(&expression->binary); break; case EXPR_REFERENCE: + case EXPR_REFERENCE_ENUM_VALUE: print_reference_expression(&expression->reference); break; case EXPR_ARRAY_ACCESS: @@ -817,14 +724,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); @@ -835,6 +739,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,13 +755,15 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p print_statement_expression(&expression->statement); break; +#if 0 default: /* TODO */ - fprintf(out, "some expression of type %d", (int) expression->kind); + print_format("some expression of type %d", (int)expression->kind); break; +#endif } - if (top_prec > prec) - fputc(')', out); + if (parenthesized) + print_string(")"); } /** @@ -864,7 +773,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; @@ -879,7 +788,7 @@ static void print_compound_statement(const compound_statement_t *block) } --indent; print_indent(); - fputs("}\n", out); + print_string(block->stmt_expr ? "}" : "}\n"); } /** @@ -889,10 +798,14 @@ static void print_compound_statement(const compound_statement_t *block) */ static void print_return_statement(const return_statement_t *statement) { - fputs("return ", out); - if(statement->value != NULL) - print_expression(statement->value); - fputs(";\n", out); + expression_t const *const val = statement->value; + if (val != NULL) { + print_string("return "); + print_expression(val); + print_string(";\n"); + } else { + print_string("return;\n"); + } } /** @@ -903,7 +816,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"); } /** @@ -913,14 +826,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->symbol->string, out); + print_string(statement->label->base.symbol->string); } - fputs(";\n", out); + print_string(";\n"); } /** @@ -930,7 +843,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->symbol->string); + print_format("%s:\n", statement->label->base.symbol->string); print_indent(); print_statement(statement->statement); } @@ -942,14 +855,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) { + if (statement->false_statement != NULL) { print_indent(); - fputs("else ", out); + print_string("else "); print_statement(statement->false_statement); } } @@ -961,9 +874,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); } @@ -974,19 +887,19 @@ 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); + if (statement->expression == NULL) { + 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) { + if (statement->statement != NULL) { if (statement->statement->base.kind == STATEMENT_CASE_LABEL) { --indent; } @@ -995,6 +908,28 @@ static void print_case_label(const case_label_statement_t *statement) } } +static void print_typedef(const entity_t *entity) +{ + print_string("typedef "); + print_type_ext(entity->typedefe.type, entity->base.symbol, NULL); + print_string(";"); +} + +/** + * returns true if the entity is a compiler generated one and has no real + * correspondenc in the source file + */ +static bool is_generated_entity(const entity_t *entity) +{ + if (entity->kind == ENTITY_TYPEDEF) + return entity->typedefe.builtin; + + if (is_declaration(entity)) + return entity->declaration.implicit; + + return false; +} + /** * Print a declaration statement. * @@ -1004,38 +939,27 @@ static void print_declaration_statement( const declaration_statement_t *statement) { bool first = true; - declaration_t *declaration = statement->declarations_begin; - - 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; + entity_t *entity = statement->declarations_begin; + if (entity == NULL) { + print_string("/* empty declaration statement */\n"); + return; + } - if (!first) { - print_indent(); - } else { - first = false; - } - print_declaration(declaration); - fputc('\n', out); + entity_t *const end = statement->declarations_end->base.next; + for (; entity != end; entity = entity->base.next) { + if (entity->kind == ENTITY_ENUM_VALUE) + continue; + if (is_generated_entity(entity)) + continue; + + if (!first) { + print_indent(); + } else { + first = false; } + + print_entity(entity); + print_string("\n"); } } @@ -1046,9 +970,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); } @@ -1059,12 +983,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"); } /** @@ -1074,31 +998,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); - declaration_t *decl = statement->scope.declarations; - while (decl != NULL && decl->implicit) - decl = decl->next; - if (decl != NULL) { - assert(statement->initialisation == NULL); - print_declaration(decl); - if (decl->next != NULL) { - panic("multiple declarations in for statement not supported yet"); - } - fputc(' ', out); + 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); } - fputs("; ", out); } - if(statement->condition != NULL) { + if (statement->condition != NULL) { + print_string(" "); print_expression(statement->condition); } - fputs("; ", out); - if(statement->step != NULL) { + print_string(";"); + if (statement->step != NULL) { + print_string(" "); print_expression(statement->step); } - fputs(") ", out); + print_string(") "); print_statement(statement->body); } @@ -1110,17 +1032,17 @@ static void print_for_statement(const for_statement_t *statement) static void print_asm_arguments(asm_argument_t *arguments) { asm_argument_t *argument = arguments; - for( ; argument != NULL; argument = argument->next) { - if(argument != arguments) - fputs(", ", out); + for (; argument != NULL; argument = argument->next) { + if (argument != arguments) + print_string(", "); - if(argument->symbol) { - fprintf(out, "[%s] ", argument->symbol->string); + if (argument->symbol) { + print_format("[%s] ", argument->symbol->string); } print_quoted_string(&argument->constraints, '"', 1); - fputs(" (", out); + print_string(" ("); print_expression(argument->expression); - fputs(")", out); + print_string(")"); } } @@ -1132,9 +1054,9 @@ static void print_asm_arguments(asm_argument_t *arguments) static void print_asm_clobbers(asm_clobber_t *clobbers) { asm_clobber_t *clobber = clobbers; - for( ; clobber != NULL; clobber = clobber->next) { - if(clobber != clobbers) - fputs(", ", out); + for (; clobber != NULL; clobber = clobber->next) { + if (clobber != clobbers) + print_string(", "); print_quoted_string(&clobber->clobber, '"', 1); } @@ -1147,31 +1069,32 @@ static void print_asm_clobbers(asm_clobber_t *clobbers) */ static void print_asm_statement(const asm_statement_t *statement) { - fputs("asm ", out); - if(statement->is_volatile) { - fputs("volatile ", out); + print_string("asm "); + if (statement->is_volatile) { + print_string("volatile "); } - fputs("(", out); + print_string("("); print_quoted_string(&statement->asm_text, '"', 1); - if(statement->inputs == NULL && statement->outputs == NULL - && statement->clobbers == NULL) + if (statement->outputs == NULL && + statement->inputs == NULL && + statement->clobbers == NULL) goto end_of_print_asm_statement; - fputs(" : ", out); - print_asm_arguments(statement->inputs); - if(statement->outputs == NULL && statement->clobbers == NULL) + print_string(" : "); + print_asm_arguments(statement->outputs); + if (statement->inputs == NULL && statement->clobbers == NULL) goto end_of_print_asm_statement; - fputs(" : ", out); - print_asm_arguments(statement->outputs); - if(statement->clobbers == NULL) + print_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"); } /** @@ -1181,15 +1104,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); + if (statement->except_expression != NULL) { + print_string("__except("); print_expression(statement->except_expression); - fputs(") ", out); + print_string(") "); } else { - fputs("__finally ", out); + print_string("__finally "); } print_statement(statement->final_statement); } @@ -1201,8 +1124,8 @@ 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); + (void)statement; + print_string("__leave;\n"); } /** @@ -1214,7 +1137,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); @@ -1232,10 +1155,10 @@ void print_statement(const statement_t *statement) 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); @@ -1268,7 +1191,7 @@ void print_statement(const statement_t *statement) print_leave_statement(&statement->leave); break; case STATEMENT_INVALID: - fputs("$invalid statement$", out); + print_string("$invalid statement$\n"); break; } } @@ -1280,19 +1203,15 @@ void print_statement(const statement_t *statement) */ static void print_storage_class(storage_class_tag_t storage_class) { - switch(storage_class) { - case STORAGE_CLASS_ENUM_ENTRY: - case STORAGE_CLASS_NONE: - break; - case STORAGE_CLASS_TYPEDEF: fputs("typedef ", out); break; - case STORAGE_CLASS_EXTERN: fputs("extern ", out); break; - case STORAGE_CLASS_STATIC: fputs("static ", out); break; - case STORAGE_CLASS_AUTO: fputs("auto ", out); break; - case STORAGE_CLASS_REGISTER: fputs("register ", out); break; - case STORAGE_CLASS_THREAD: fputs("__thread", out); break; - case STORAGE_CLASS_THREAD_EXTERN: fputs("extern __thread", out); break; - case STORAGE_CLASS_THREAD_STATIC: fputs("static __thread", out); break; + switch (storage_class) { + case STORAGE_CLASS_NONE: return; + 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; } + panic("invalid storage class"); } /** @@ -1302,153 +1221,220 @@ static void print_storage_class(storage_class_tag_t storage_class) */ void print_initializer(const initializer_t *initializer) { - if(initializer == NULL) { - fputs("{}", out); + if (initializer == NULL) { + print_string("{}"); return; } - switch(initializer->kind) { + switch (initializer->kind) { case INITIALIZER_VALUE: { const initializer_value_t *value = &initializer->value; - print_expression(value->value); + print_assignment_expression(value->value); return; } case INITIALIZER_LIST: { 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) { + for (size_t i = 0 ; i < list->len; ++i) { const initializer_t *sub_init = list->initializers[i]; print_initializer(list->initializers[i]); - if(i < list->len-1) { - if(sub_init == NULL || sub_init->kind != INITIALIZER_DESIGNATOR) - fputs(", ", out); + if (i < list->len-1) { + if (sub_init == NULL || sub_init->kind != INITIALIZER_DESIGNATOR) + print_string(", "); } } - fputs(" }", out); + print_string(" }"); return; } case INITIALIZER_STRING: print_quoted_string(&initializer->string.string, '"', 1); return; case INITIALIZER_WIDE_STRING: - print_quoted_wide_string(&initializer->wide_string.string, '"', 1); + print_quoted_string(&initializer->string.string, '"', 1); 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. */ -static void print_ms_modifiers(const declaration_t *declaration) { - if((c_mode & _MS) == 0) +static void print_ms_modifiers(const declaration_t *declaration) +{ + if ((c_mode & _MS) == 0) return; decl_modifiers_t modifiers = declaration->modifiers; - /* DM_FORCEINLINE handled outside. */ - if ((modifiers & ~DM_FORCEINLINE) != 0 || - declaration->alignment != 0 || - declaration->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); + bool ds_shown = false; + const char *next = "("; + + if (declaration->base.kind == ENTITY_VARIABLE) { + variable_t *variable = (variable_t*)declaration; + if (variable->alignment != 0 + || variable->get_property_sym != NULL + || variable->put_property_sym != NULL) { + if (!ds_shown) { + print_string("__declspec"); + ds_shown = true; + } + + if (variable->alignment != 0) { + print_string(next); next = ", "; print_format("align(%u)", variable->alignment); + } + if (variable->get_property_sym != NULL + || variable->put_property_sym != NULL) { + char *comma = ""; + print_string(next); next = ", "; print_string("property("); + if (variable->get_property_sym != NULL) { + print_format("get=%s", variable->get_property_sym->string); + comma = ", "; + } + if (variable->put_property_sym != NULL) + print_format("%sput=%s", comma, variable->put_property_sym->string); + print_string(")"); + } } - if(modifiers & DM_DLLEXPORT) { - fputs(next, out); next = ", "; fputs("dllexport", out); + } + + /* DM_FORCEINLINE handled outside. */ + if ((modifiers & ~DM_FORCEINLINE) != 0) { + if (!ds_shown) { + print_string("__declspec"); + ds_shown = true; } - if(modifiers & DM_THREAD) { - fputs(next, out); next = ", "; fputs("thread", out); + if (modifiers & DM_DLLIMPORT) { + print_string(next); next = ", "; print_string("dllimport"); } - if(modifiers & DM_NAKED) { - fputs(next, out); next = ", "; fputs("naked", out); + if (modifiers & DM_DLLEXPORT) { + print_string(next); next = ", "; print_string("dllexport"); } - if(modifiers & DM_THREAD) { - fputs(next, out); next = ", "; fputs("thread", out); + if (modifiers & DM_THREAD) { + print_string(next); next = ", "; print_string("thread"); } - if(modifiers & DM_SELECTANY) { - fputs(next, out); next = ", "; fputs("selectany", out); + if (modifiers & DM_NAKED) { + print_string(next); next = ", "; print_string("naked"); } - if(modifiers & DM_NOTHROW) { - fputs(next, out); next = ", "; fputs("nothrow", out); + if (modifiers & DM_THREAD) { + print_string(next); next = ", "; print_string("thread"); } - if(modifiers & DM_NORETURN) { - fputs(next, out); next = ", "; fputs("noreturn", out); + if (modifiers & DM_SELECTANY) { + print_string(next); next = ", "; print_string("selectany"); } - if(modifiers & DM_NOINLINE) { - fputs(next, out); next = ", "; fputs("noinline", out); + if (modifiers & DM_NOTHROW) { + print_string(next); next = ", "; print_string("nothrow"); } - if (modifiers & DM_DEPRECATED) { - fputs(next, out); next = ", "; fputs("deprecated", out); - if(declaration->deprecated_string != NULL) - fprintf(out, "(\"%s\")", declaration->deprecated_string); + if (modifiers & DM_NORETURN) { + print_string(next); next = ", "; print_string("noreturn"); } - if(declaration->alignment != 0) { - fputs(next, out); next = ", "; fprintf(out, "align(%u)", declaration->alignment); + if (modifiers & DM_NOINLINE) { + print_string(next); next = ", "; print_string("noinline"); } - if(modifiers & DM_RESTRICT) { - fputs(next, out); next = ", "; fputs("restrict", out); + if (modifiers & DM_DEPRECATED) { + print_string(next); next = ", "; print_string("deprecated"); + if (declaration->deprecated_string != NULL) + print_format("(\"%s\")", + declaration->deprecated_string); } - if(modifiers & DM_NOALIAS) { - fputs(next, out); next = ", "; fputs("noalias", out); + if (modifiers & DM_RESTRICT) { + print_string(next); next = ", "; print_string("restrict"); } - 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); + if (modifiers & DM_NOALIAS) { + print_string(next); next = ", "; print_string("noalias"); } - fputs(") ", out); } + + if (ds_shown) + print_string(") "); +} +#endif + +static void print_scope(const scope_t *scope) +{ + const entity_t *entity = scope->entities; + for ( ; entity != NULL; entity = entity->base.next) { + print_indent(); + print_entity(entity); + print_string("\n"); + } +} + +static void print_namespace(const namespace_t *namespace) +{ + print_string("namespace "); + if (namespace->base.symbol != NULL) { + print_string(namespace->base.symbol->string); + print_string(" "); + } + + print_string("{\n"); + ++indent; + + print_scope(&namespace->members); + + --indent; + print_indent(); + print_string("}\n"); } /** - * Print a declaration in the NORMAL namespace. - * - * @param declaration the declaration + * Print a variable or function declaration */ -static void print_normal_declaration(const declaration_t *declaration) -{ - print_storage_class((storage_class_tag_t) declaration->declared_storage_class); - if (declaration->is_inline) { - if (declaration->modifiers & DM_FORCEINLINE) { - fputs("__forceinline ", out); - } else if (declaration->modifiers & DM_MICROSOFT_INLINE) { - fputs("__inline ", out); - } else { - fputs("inline ", out); +void print_declaration(const entity_t *entity) +{ + assert(is_declaration(entity)); + const declaration_t *declaration = &entity->declaration; + + print_storage_class((storage_class_tag_t)declaration->declared_storage_class); + if (entity->kind == ENTITY_FUNCTION) { + function_t *function = (function_t*)declaration; + if (function->is_inline) { + if (declaration->modifiers & DM_FORCEINLINE) { + print_string("__forceinline "); + } else if (declaration->modifiers & DM_MICROSOFT_INLINE) { + print_string("__inline "); + } else { + print_string("inline "); + } } } - print_ms_modifiers(declaration); - print_type_ext(declaration->type, declaration->symbol, - &declaration->scope); + //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) { + print_string("\n"); + print_indent(); + print_statement(entity->function.statement); + return; + } + break; - if(declaration->type->kind == TYPE_FUNCTION) { - if(declaration->init.statement != NULL) { - fputs("\n", out); - print_statement(declaration->init.statement); - return; - } - } else if(declaration->init.initializer != NULL) { - fputs(" = ", out); - print_initializer(declaration->init.initializer); + case ENTITY_VARIABLE: + if (entity->variable.thread_local) + print_string("__thread "); + print_type_ext(declaration->type, declaration->base.symbol, NULL); + if (entity->variable.initializer != NULL) { + print_string(" = "); + print_initializer(entity->variable.initializer); + } + break; + + default: + print_type_ext(declaration->type, declaration->base.symbol, NULL); + break; } - fputc(';', out); + print_string(";"); } /** @@ -1456,7 +1442,8 @@ static void print_normal_declaration(const declaration_t *declaration) * * @param expression the expression */ -void print_expression(const expression_t *expression) { +void print_expression(const expression_t *expression) +{ print_expression_prec(expression, PREC_BOTTOM); } @@ -1465,38 +1452,62 @@ void print_expression(const expression_t *expression) { * * @param declaration the declaration */ -void print_declaration(const declaration_t *declaration) +void print_entity(const entity_t *entity) { - if (declaration->namespc != NAMESPACE_NORMAL && - declaration->symbol == NULL) + if (entity->base.namespc != NAMESPACE_NORMAL && entity->base.symbol == NULL) return; - switch (declaration->namespc) { - case NAMESPACE_NORMAL: - print_normal_declaration(declaration); - break; - case NAMESPACE_STRUCT: - fputs("struct ", out); - fputs(declaration->symbol->string, out); - fputc(' ', out); - print_compound_definition(declaration); - fputc(';', out); - break; - case NAMESPACE_UNION: - fputs("union ", out); - fputs(declaration->symbol->string, out); - fputc(' ', out); - print_compound_definition(declaration); - fputc(';', out); - break; - case NAMESPACE_ENUM: - fputs("enum ", out); - fputs(declaration->symbol->string, out); - fputc(' ', out); - print_enum_definition(declaration); - fputc(';', out); + switch ((entity_kind_tag_t)entity->kind) { + case ENTITY_VARIABLE: + case ENTITY_PARAMETER: + case ENTITY_COMPOUND_MEMBER: + 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: + print_string("struct "); + goto print_compound; + case ENTITY_UNION: + print_string("union "); +print_compound: + print_string(entity->base.symbol->string); + if (entity->compound.complete) { + print_string(" "); + print_compound_definition(&entity->compound); + } + print_string(";"); + return; + case ENTITY_ENUM: + print_string("enum "); + print_string(entity->base.symbol->string); + print_string(" "); + print_enum_definition(&entity->enume); + 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: + panic("print_entity used on unexpected entity type"); + case ENTITY_INVALID: break; } + panic("Invalid entity type encountered"); } /** @@ -1506,55 +1517,57 @@ void print_declaration(const declaration_t *declaration) */ void print_ast(const translation_unit_t *unit) { - inc_type_visited(); - - declaration_t *declaration = unit->scope.declarations; - for( ; declaration != NULL; declaration = declaration->next) { - if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY) + entity_t *entity = unit->scope.entities; + for ( ; entity != NULL; entity = entity->base.next) { + if (entity->kind == ENTITY_ENUM_VALUE) continue; - if(declaration->namespc != NAMESPACE_NORMAL && - declaration->symbol == NULL) + if (entity->base.namespc != NAMESPACE_NORMAL + && entity->base.symbol == NULL) continue; - if (declaration->implicit) + if (is_generated_entity(entity)) continue; print_indent(); - print_declaration(declaration); - fputc('\n', out); + print_entity(entity); + print_string("\n"); } } -bool is_constant_initializer(const initializer_t *initializer) +expression_classification_t is_constant_initializer(const initializer_t *initializer) { - switch(initializer->kind) { + switch (initializer->kind) { case INITIALIZER_STRING: case INITIALIZER_WIDE_STRING: case INITIALIZER_DESIGNATOR: - return true; + return EXPR_CLASS_CONSTANT; case INITIALIZER_VALUE: return is_constant_expression(initializer->value.value); - case INITIALIZER_LIST: - for(size_t i = 0; i < initializer->list.len; ++i) { + case INITIALIZER_LIST: { + expression_classification_t all = EXPR_CLASS_CONSTANT; + for (size_t i = 0; i < initializer->list.len; ++i) { initializer_t *sub_initializer = initializer->list.initializers[i]; - if(!is_constant_initializer(sub_initializer)) - return false; + expression_classification_t const cur = is_constant_initializer(sub_initializer); + if (all > cur) { + all = cur; + } } - return true; + return all; + } } panic("invalid initializer kind found"); } -static bool is_object_with_linker_constant_address(const expression_t *expression) +static expression_classification_t is_object_with_linker_constant_address(const expression_t *expression) { - switch(expression->kind) { + switch (expression->kind) { case EXPR_UNARY_DEREFERENCE: return is_address_constant(expression->unary.value); case EXPR_SELECT: { type_t *base_type = skip_typeref(expression->select.compound->base.type); - if(is_type_pointer(base_type)) { + if (is_type_pointer(base_type)) { /* it's a -> */ return is_address_constant(expression->select.compound); } else { @@ -1562,30 +1575,50 @@ static bool is_object_with_linker_constant_address(const expression_t *expressio } } - case EXPR_ARRAY_ACCESS: - return is_constant_expression(expression->array_access.index) - && is_address_constant(expression->array_access.array_ref); + case EXPR_ARRAY_ACCESS: { + expression_classification_t const ref = is_address_constant(expression->array_access.array_ref); + expression_classification_t const idx = is_constant_expression(expression->array_access.index); + return ref < idx ? ref : idx; + } case EXPR_REFERENCE: { - declaration_t *declaration = expression->reference.declaration; - switch((storage_class_tag_t) declaration->storage_class) { - case STORAGE_CLASS_NONE: - case STORAGE_CLASS_EXTERN: - case STORAGE_CLASS_STATIC: - return true; - default: - return false; + entity_t *entity = expression->reference.entity; + if (is_declaration(entity)) { + switch ((storage_class_tag_t)entity->declaration.storage_class) { + case STORAGE_CLASS_NONE: + case STORAGE_CLASS_EXTERN: + case STORAGE_CLASS_STATIC: + return + entity->kind != ENTITY_VARIABLE || + !entity->variable.thread_local ? EXPR_CLASS_CONSTANT : + EXPR_CLASS_VARIABLE; + + case STORAGE_CLASS_REGISTER: + case STORAGE_CLASS_TYPEDEF: + case STORAGE_CLASS_AUTO: + break; + } } + return EXPR_CLASS_VARIABLE; } + case EXPR_INVALID: + return EXPR_CLASS_ERROR; + default: - return false; + return EXPR_CLASS_VARIABLE; } } -bool is_address_constant(const expression_t *expression) +expression_classification_t is_address_constant(const expression_t *expression) { - switch(expression->kind) { + switch (expression->kind) { + case EXPR_STRING_LITERAL: + case EXPR_WIDE_STRING_LITERAL: + case EXPR_FUNCNAME: + case EXPR_LABEL_ADDRESS: + return EXPR_CLASS_CONSTANT; + case EXPR_UNARY_TAKE_ADDRESS: return is_object_with_linker_constant_address(expression->unary.value); @@ -1593,144 +1626,204 @@ bool is_address_constant(const expression_t *expression) type_t *real_type = revert_automatic_type_conversion(expression->unary.value); /* dereferencing a function is a NOP */ - if(is_type_function(real_type)) { + if (is_type_function(real_type)) { return is_address_constant(expression->unary.value); } - - /* fallthrough */ + /* FALLTHROUGH */ } case EXPR_UNARY_CAST: { type_t *dest = skip_typeref(expression->base.type); - if (!is_type_pointer(dest) && - ! (dest->kind == TYPE_ATOMIC - && (get_atomic_type_flags(dest->atomic.akind) & ATOMIC_TYPE_FLAG_INTEGER) - && (get_atomic_type_size(dest->atomic.akind) >= get_atomic_type_size(get_intptr_kind())))) - return false; - - return (is_constant_expression(expression->unary.value) - || is_address_constant(expression->unary.value)); + 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 EXPR_CLASS_VARIABLE; + + expression_classification_t const expr = is_constant_expression(expression->unary.value); + expression_classification_t const addr = is_address_constant(expression->unary.value); + return expr > addr ? expr : addr; } case EXPR_BINARY_ADD: case EXPR_BINARY_SUB: { - expression_t *left = expression->binary.left; - expression_t *right = expression->binary.right; - - if(is_type_pointer(skip_typeref(left->base.type))) { - return is_address_constant(left) && is_constant_expression(right); - } else if(is_type_pointer(skip_typeref(right->base.type))) { - return is_constant_expression(left) && is_address_constant(right); + expression_t *const left = expression->binary.left; + expression_t *const right = expression->binary.right; + type_t *const ltype = skip_typeref(left->base.type); + type_t *const rtype = skip_typeref(right->base.type); + + if (is_type_pointer(ltype)) { + expression_classification_t const l = is_address_constant(left); + expression_classification_t const r = is_constant_expression(right); + return l < r ? l : r; + } else if (is_type_pointer(rtype)) { + expression_classification_t const l = is_constant_expression(left); + expression_classification_t const r = is_address_constant(right); + return l < r ? l : r; + } else if (!is_type_valid(ltype) || !is_type_valid(rtype)) { + return EXPR_CLASS_ERROR; + } else { + return EXPR_CLASS_VARIABLE; } - - return false; } case EXPR_REFERENCE: { - declaration_t *declaration = expression->reference.declaration; - type_t *type = skip_typeref(declaration->type); - if(is_type_function(type)) - return true; - if(is_type_array(type)) { + entity_t *entity = expression->reference.entity; + if (!is_declaration(entity)) + return EXPR_CLASS_VARIABLE; + + type_t *type = skip_typeref(entity->declaration.type); + if (is_type_function(type)) + return EXPR_CLASS_CONSTANT; + if (is_type_array(type)) { return is_object_with_linker_constant_address(expression); } - return false; + /* Prevent stray errors */ + if (!is_type_valid(type)) + return EXPR_CLASS_ERROR; + return EXPR_CLASS_VARIABLE; + } + + case EXPR_ARRAY_ACCESS: { + type_t *const type = + skip_typeref(revert_automatic_type_conversion(expression)); + if (!is_type_array(type)) + return EXPR_CLASS_VARIABLE; + expression_classification_t const ref = is_address_constant(expression->array_access.array_ref); + expression_classification_t const idx = is_constant_expression(expression->array_access.index); + return ref < idx ? ref : idx; + } + + case EXPR_CONDITIONAL: { + expression_t *const c = expression->conditional.condition; + expression_classification_t const cclass = is_constant_expression(c); + if (cclass != EXPR_CLASS_CONSTANT) + return cclass; + + if (fold_constant_to_bool(c)) { + expression_t const *const t = expression->conditional.true_expression; + return is_address_constant(t != NULL ? t : c); + } else { + return is_address_constant(expression->conditional.false_expression); + } } + case EXPR_INVALID: + return EXPR_CLASS_ERROR; + default: - return false; + return EXPR_CLASS_VARIABLE; } } -static bool is_builtin_const_call(const expression_t *expression) +/** + * Check if the given expression is a call to a builtin function + * returning a constant result. + */ +static expression_classification_t 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; + if (function->kind != EXPR_REFERENCE) + return EXPR_CLASS_VARIABLE; + reference_expression_t *ref = &function->reference; + if (ref->entity->kind != ENTITY_FUNCTION) + return EXPR_CLASS_VARIABLE; + + switch (ref->entity->function.btk) { + case bk_gnu_builtin_huge_val: + case bk_gnu_builtin_huge_valf: + case bk_gnu_builtin_huge_vall: + case bk_gnu_builtin_inf: + case bk_gnu_builtin_inff: + case bk_gnu_builtin_infl: + case bk_gnu_builtin_nan: + case bk_gnu_builtin_nanf: + case bk_gnu_builtin_nanl: + return EXPR_CLASS_CONSTANT; + default: + return EXPR_CLASS_VARIABLE; } - return false; } -static bool is_constant_pointer(const expression_t *expression) +static expression_classification_t is_constant_pointer(const expression_t *expression) { - if (is_constant_expression(expression)) - return true; + expression_classification_t const expr_class = is_constant_expression(expression); + if (expr_class != EXPR_CLASS_VARIABLE) + return expr_class; switch (expression->kind) { case EXPR_UNARY_CAST: return is_constant_pointer(expression->unary.value); default: - return false; + return EXPR_CLASS_VARIABLE; } } -static bool is_object_with_constant_address(const expression_t *expression) +static expression_classification_t is_object_with_constant_address(const expression_t *expression) { - switch(expression->kind) { + switch (expression->kind) { case EXPR_SELECT: { expression_t *compound = expression->select.compound; type_t *compound_type = compound->base.type; compound_type = skip_typeref(compound_type); - if(is_type_pointer(compound_type)) { + if (is_type_pointer(compound_type)) { return is_constant_pointer(compound); } else { return is_object_with_constant_address(compound); } } - case EXPR_ARRAY_ACCESS: - return is_constant_pointer(expression->array_access.array_ref) - && is_constant_expression(expression->array_access.index); + + case EXPR_ARRAY_ACCESS: { + array_access_expression_t const* const array_access = + &expression->array_access; + expression_classification_t const idx_class = is_constant_expression(array_access->index); + if (idx_class != EXPR_CLASS_CONSTANT) + return idx_class; + expression_classification_t const ref_addr = is_object_with_constant_address(array_access->array_ref); + expression_classification_t const ref_ptr = is_constant_pointer(array_access->array_ref); + return ref_addr > ref_ptr ? ref_addr : ref_ptr; + } + case EXPR_UNARY_DEREFERENCE: return is_constant_pointer(expression->unary.value); + + case EXPR_INVALID: + return EXPR_CLASS_ERROR; + default: - return false; + return EXPR_CLASS_VARIABLE; } } -bool is_constant_expression(const expression_t *expression) +expression_classification_t is_constant_expression(const expression_t *expression) { switch (expression->kind) { - - case EXPR_CONST: - case EXPR_CHARACTER_CONSTANT: - case EXPR_WIDE_CHARACTER_CONSTANT: - case EXPR_STRING_LITERAL: - case EXPR_WIDE_STRING_LITERAL: + EXPR_LITERAL_CASES case EXPR_CLASSIFY_TYPE: - case EXPR_FUNCNAME: case EXPR_OFFSETOF: case EXPR_ALIGNOF: case EXPR_BUILTIN_CONSTANT_P: - case EXPR_LABEL_ADDRESS: - return true; + case EXPR_BUILTIN_TYPES_COMPATIBLE_P: + case EXPR_REFERENCE_ENUM_VALUE: + return EXPR_CLASS_CONSTANT; 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 ? EXPR_CLASS_CONSTANT : + EXPR_CLASS_VARIABLE; } - 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_UNARY_POSTFIX_INCREMENT: case EXPR_UNARY_POSTFIX_DECREMENT: @@ -1738,6 +1831,9 @@ bool is_constant_expression(const expression_t *expression) case EXPR_UNARY_PREFIX_DECREMENT: case EXPR_UNARY_ASSUME: /* has VOID type */ case EXPR_UNARY_DEREFERENCE: + case EXPR_UNARY_DELETE: + case EXPR_UNARY_DELETE_ARRAY: + case EXPR_UNARY_THROW: case EXPR_BINARY_ASSIGN: case EXPR_BINARY_MUL_ASSIGN: case EXPR_BINARY_DIV_ASSIGN: @@ -1751,7 +1847,12 @@ bool is_constant_expression(const expression_t *expression) case EXPR_BINARY_BITWISE_OR_ASSIGN: case EXPR_BINARY_COMMA: case EXPR_ARRAY_ACCESS: - return false; + return EXPR_CLASS_VARIABLE; + + case EXPR_REFERENCE: { + type_t *const type = skip_typeref(expression->base.type); + return is_type_valid(type) ? EXPR_CLASS_VARIABLE : EXPR_CLASS_ERROR; + } case EXPR_UNARY_TAKE_ADDRESS: return is_object_with_constant_address(expression->unary.value); @@ -1766,9 +1867,14 @@ bool is_constant_expression(const expression_t *expression) return is_constant_expression(expression->unary.value); case EXPR_UNARY_CAST: - case EXPR_UNARY_CAST_IMPLICIT: - return is_type_arithmetic(skip_typeref(expression->base.type)) - && is_constant_expression(expression->unary.value); + case EXPR_UNARY_CAST_IMPLICIT: { + type_t *const type = skip_typeref(expression->base.type); + if (is_type_scalar(type)) + return is_constant_expression(expression->unary.value); + if (!is_type_valid(type)) + return EXPR_CLASS_ERROR; + return EXPR_CLASS_VARIABLE; + } case EXPR_BINARY_ADD: case EXPR_BINARY_SUB: @@ -1784,45 +1890,58 @@ bool is_constant_expression(const expression_t *expression) case EXPR_BINARY_BITWISE_AND: case EXPR_BINARY_BITWISE_OR: case EXPR_BINARY_BITWISE_XOR: - case EXPR_BINARY_LOGICAL_AND: - case EXPR_BINARY_LOGICAL_OR: case EXPR_BINARY_SHIFTLEFT: case EXPR_BINARY_SHIFTRIGHT: - case EXPR_BINARY_BUILTIN_EXPECT: case EXPR_BINARY_ISGREATER: case EXPR_BINARY_ISGREATEREQUAL: case EXPR_BINARY_ISLESS: case EXPR_BINARY_ISLESSEQUAL: case EXPR_BINARY_ISLESSGREATER: - case EXPR_BINARY_ISUNORDERED: - return is_constant_expression(expression->binary.left) - && is_constant_expression(expression->binary.right); + case EXPR_BINARY_ISUNORDERED: { + expression_classification_t const l = is_constant_expression(expression->binary.left); + expression_classification_t const r = is_constant_expression(expression->binary.right); + return l < r ? l : r; + } + + case EXPR_BINARY_LOGICAL_AND: { + expression_t const *const left = expression->binary.left; + expression_classification_t const lclass = is_constant_expression(left); + if (lclass != EXPR_CLASS_CONSTANT) + return lclass; + if (!fold_constant_to_bool(left)) + return EXPR_CLASS_CONSTANT; + return is_constant_expression(expression->binary.right); + } + + case EXPR_BINARY_LOGICAL_OR: { + expression_t const *const left = expression->binary.left; + expression_classification_t const lclass = is_constant_expression(left); + if (lclass != EXPR_CLASS_CONSTANT) + return lclass; + if (fold_constant_to_bool(left)) + return EXPR_CLASS_CONSTANT; + return is_constant_expression(expression->binary.right); + } case EXPR_COMPOUND_LITERAL: return is_constant_initializer(expression->compound_literal.initializer); case EXPR_CONDITIONAL: { - expression_t *condition = expression->conditional.condition; - if(!is_constant_expression(condition)) - return false; - - long val = fold_constant(condition); - if(val != 0) - return is_constant_expression(expression->conditional.true_expression); - else + expression_t *const condition = expression->conditional.condition; + expression_classification_t const cclass = is_constant_expression(condition); + if (cclass != EXPR_CLASS_CONSTANT) + return cclass; + + if (fold_constant_to_bool(condition)) { + expression_t const *const t = expression->conditional.true_expression; + return t == NULL ? EXPR_CLASS_CONSTANT : is_constant_expression(t); + } else { return is_constant_expression(expression->conditional.false_expression); - } - - case EXPR_REFERENCE: { - declaration_t *declaration = expression->reference.declaration; - if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY) - return true; - - return false; + } } case EXPR_INVALID: - return true; + return EXPR_CLASS_ERROR; case EXPR_UNKNOWN: break; @@ -1830,41 +1949,12 @@ bool is_constant_expression(const expression_t *expression) panic("invalid expression found (is constant expression)"); } -/** - * Initialize the AST construction. - */ void init_ast(void) { obstack_init(&ast_obstack); } -/** - * Free the AST. - */ 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. - * - * @param size the size of the object to allocate - * - * @return A new allocated object in the AST memeory space. - */ -void *(allocate_ast)(size_t size) -{ - return _allocate_ast(size); -}