X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast.c;h=c62110a1afdcbff3dfb97db4c0d0c6587c5a8308;hb=d19234c0fe4d47948c5732b9aee9819ff31f60f2;hp=f09b346bbf096d12bebbcd07ca5eee42c6adab9c;hpb=ed1ed2b5fb813fd8de24b2eaa6fffce033246a8c;p=cparser diff --git a/ast.c b/ast.c index f09b346..c62110a 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,6 +25,8 @@ #include "parser.h" #include "lang_features.h" #include "entity_t.h" +#include "printer.h" +#include "types.h" #include #include @@ -40,16 +42,14 @@ #endif #include "adt/error.h" +#include "adt/util.h" struct obstack ast_obstack; -static FILE *out; -static int indent; +static int indent; +static int case_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); @@ -64,7 +64,14 @@ void change_indent(int delta) void print_indent(void) { for (int i = 0; i < indent; ++i) - fputc('\t', out); + print_char('\t'); +} + +static void print_stringrep(const string_t *string) +{ + for (size_t i = 0; i < string->size; ++i) { + print_char(string->begin[i]); + } } /** @@ -76,13 +83,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; } } @@ -94,141 +101,98 @@ 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_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_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_atomic(type, ATOMIC_TYPE_BOOL)) { - fputs(cnst->v.int_value ? "true" : "false", out); - } else if (is_type_integer(type)) { - fprintf(out, "%lld", cnst->v.int_value); - } else if (is_type_float(type)) { - long double const val = cnst->v.float_value; -#ifdef _WIN32 - /* ARG, no way to print long double */ - fprintf(out, "%.20g", (double)val); -#else - fprintf(out, "%.20Lg", val); -#endif - if (isfinite(val) && truncl(val) == val) - fputs(".0", out); - } else { - panic("unknown constant"); - } - - char const* suffix; - switch (type->atomic.akind) { - case ATOMIC_TYPE_UINT: suffix = "U"; break; - case ATOMIC_TYPE_LONG: suffix = "L"; break; - case ATOMIC_TYPE_ULONG: suffix = "UL"; break; - case ATOMIC_TYPE_LONGLONG: suffix = "LL"; break; - case ATOMIC_TYPE_ULONGLONG: suffix = "ULL"; break; - case ATOMIC_TYPE_FLOAT: suffix = "F"; break; - case ATOMIC_TYPE_LONG_DOUBLE: suffix = "L"; break; - - default: return; - } - fputs(suffix, out); -} - /** * Print a quoted string constant. * @@ -236,122 +200,79 @@ 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_char('\\'); } - 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)(unsigned char)*c); - break; + if ((unsigned)tc < 0x80 && !isprint(tc)) { + print_format("\\%03o", (unsigned)tc); + } else { + print_char(tc); } - fputc(*c, out); break; } } - fputc(border, out); + print_char(border); } -/** - * 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)) { - fputc(*c, out); - } else { - fprintf(out, "\\%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); - } - } - } - } - fputc(border, out); -} - -/** - * Print a constant character expression. - * - * @param cnst the constant character expression - */ -static void print_character_constant(const const_expression_t *cnst) +static void print_string_literal(const string_literal_expression_t *literal) { - print_quoted_string(&cnst->v.character, '\'', 0); -} - -static void print_wide_character_constant(const const_expression_t *cnst) -{ - print_quoted_wide_string(&cnst->v.wide_character, '\'', 0); + 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.size > 0) + print_stringrep(&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"); } /** @@ -366,21 +287,15 @@ static void print_funcname(const funcname_expression_t *funcname) case FUNCNAME_FUNCSIG: s = "__FUNCSIG__"; break; case FUNCNAME_FUNCDNAME: s = "__FUNCDNAME__"; break; } - fputs(s, 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_char('('); print_type(expression->type); - fputc(')', out); + print_char(')'); print_initializer(expression->initializer); } @@ -396,14 +311,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_char('('); call_argument_t *argument = call->arguments; int first = 1; while (argument != NULL) { if (!first) { - fputs(", ", out); + print_string(", "); } else { first = 0; } @@ -411,7 +325,7 @@ static void print_call_expression(const call_expression_t *call) argument = argument->next; } - fputc(')', out); + print_char(')'); } /** @@ -460,7 +374,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); } @@ -473,43 +387,42 @@ 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_char ('-' ); break; + case EXPR_UNARY_PLUS: print_char ('+' ); break; + case EXPR_UNARY_NOT: print_char ('!' ); break; + case EXPR_UNARY_BITWISE_NEGATE: print_char ('~' ); break; + case EXPR_UNARY_PREFIX_INCREMENT: print_string("++"); break; + case EXPR_UNARY_PREFIX_DECREMENT: print_string("--"); break; + case EXPR_UNARY_DEREFERENCE: print_char ('*' ); break; + case EXPR_UNARY_TAKE_ADDRESS: print_char ('&' ); break; + case EXPR_UNARY_DELETE: print_string("delete "); break; + case EXPR_UNARY_DELETE_ARRAY: print_string("delete [] "); break; case EXPR_UNARY_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_char('('); print_type(unexpr->base.type); - fputc(')', out); + print_char(')'); break; case EXPR_UNARY_ASSUME: - fputs("__assume(", out); + print_string("__assume("); print_assignment_expression(unexpr->value); - fputc(')', out); + print_char(')'); return; case EXPR_UNARY_THROW: if (unexpr->value == NULL) { - fputs("throw", out); + print_string("throw"); return; } - fputs("throw ", out); + print_string("throw "); break; default: @@ -525,7 +438,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); } /** @@ -535,7 +448,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); } /** @@ -545,17 +458,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_char('['); print_expression(expression->index); - fputc(']', out); + print_char(']'); } else { - print_expression_prec(expression->index, prec); - fputc('[', out); + print_expression_prec(expression->index, PREC_POSTFIX); + print_char('['); print_expression(expression->array_ref); - fputc(']', out); + print_char(']'); } } @@ -567,33 +479,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_char('('); print_type(expression->type); - fputc(')', out); + print_char(')'); } } -/** - * 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. * @@ -601,29 +501,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_char(')'); } /** - * 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_char(')'); } /** @@ -634,12 +529,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); @@ -652,11 +547,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_char(')'); } /** @@ -666,11 +561,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_char(')'); +} + +/** + * 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_char(')'); } /** @@ -680,14 +589,19 @@ 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); + /* do not print anything for anonymous struct/union selects + * FIXME: if the anonymous select was a '->' this will print '.' + */ + if (expression->compound_entry->base.symbol == NULL) + return; + if (is_type_pointer(skip_typeref(expression->compound->base.type))) { - fputs("->", out); + print_string("->"); } else { - fputc('.', out); + print_char('.'); } - fputs(expression->compound_entry->base.symbol->string, out); + print_string(expression->compound_entry->base.symbol->string); } /** @@ -698,9 +612,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_char(')'); } /** @@ -712,12 +626,12 @@ static void print_designator(const designator_t *designator) { for ( ; designator != NULL; designator = designator->next) { if (designator->symbol == NULL) { - fputc('[', out); + print_char('['); print_expression(designator->array_index); - fputc(']', out); + print_char(']'); } else { - fputc('.', out); - fputs(designator->symbol->string, out); + print_char('.'); + print_string(designator->symbol->string); } } } @@ -729,12 +643,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_char(','); print_designator(expression->designator); - fputc(')', out); + print_char(')'); } /** @@ -744,9 +657,9 @@ static void print_offsetof_expression(const offsetof_expression_t *expression) */ static void print_statement_expression(const statement_expression_t *expression) { - fputc('(', out); + print_char('('); print_statement(expression->statement); - fputc(')', out); + print_char(')'); } /** @@ -757,7 +670,8 @@ static void print_statement_expression(const statement_expression_t *expression) */ static void print_expression_prec(const expression_t *expression, unsigned top_prec) { - if (expression->kind == EXPR_UNARY_CAST_IMPLICIT && !print_implicit_casts) { + if (expression->kind == EXPR_UNARY_CAST + && expression->base.implicit && !print_implicit_casts) { expression = expression->unary.value; } @@ -767,30 +681,21 @@ 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_char('('); switch (expression->kind) { - case EXPR_UNKNOWN: - case EXPR_INVALID: - fputs("$invalid expression$", out); - break; - case EXPR_CHARACTER_CONSTANT: - print_character_constant(&expression->conste); + case EXPR_ERROR: + print_string("$error$"); 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; @@ -817,14 +722,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 +737,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; @@ -847,14 +752,27 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p case EXPR_STATEMENT: print_statement_expression(&expression->statement); break; + } + if (parenthesized) + print_char(')'); +} + +static void print_indented_statement(statement_t const *const stmt) +{ + switch (stmt->kind) { + case STATEMENT_LABEL: + break; + + case STATEMENT_CASE_LABEL: + for (int i = 0; i != case_indent; ++i) + print_char('\t'); + break; default: - /* TODO */ - fprintf(out, "some expression of type %d", (int)expression->kind); + print_indent(); break; } - if (parenthesized) - fputc(')', out); + print_statement(stmt); } /** @@ -864,22 +782,19 @@ 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; while (statement != NULL) { - if (statement->base.kind == STATEMENT_CASE_LABEL) - --indent; - if (statement->kind != STATEMENT_LABEL) - print_indent(); - print_statement(statement); + print_indented_statement(statement); + print_char('\n'); statement = statement->base.next; } --indent; print_indent(); - fputs(block->stmt_expr ? "}" : "}\n", out); + print_char('}'); } /** @@ -891,11 +806,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_char(';'); } else { - fputs("return;\n", out); + print_string("return;"); } } @@ -907,7 +822,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_char(';'); } /** @@ -917,14 +832,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_char('*'); print_expression(statement->expression); } else { - fputs(statement->label->base.symbol->string, out); + print_string(statement->label->base.symbol->string); } - fputs(";\n", out); + print_char(';'); } /** @@ -934,9 +849,31 @@ 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_indent(); - print_statement(statement->statement); + print_format("%s:\n", statement->label->base.symbol->string); + print_indented_statement(statement->statement); +} + +static void print_inner_statement(statement_t const *const stmt) +{ + if (stmt->kind == STATEMENT_COMPOUND) { + print_char(' '); + print_compound_statement(&stmt->compound); + } else { + print_char('\n'); + ++indent; + print_indented_statement(stmt); + --indent; + } +} + +static void print_after_inner_statement(statement_t const *const stmt) +{ + if (stmt->kind == STATEMENT_COMPOUND) { + print_char(' '); + } else { + print_char('\n'); + print_indent(); + } } /** @@ -946,15 +883,21 @@ 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_statement(statement->true_statement); - - if (statement->false_statement != NULL) { - print_indent(); - fputs("else ", out); - print_statement(statement->false_statement); + print_char(')'); + print_inner_statement(statement->true_statement); + + statement_t const *const f = statement->false_statement; + if (f) { + print_after_inner_statement(statement->true_statement); + print_string("else"); + if (f->kind == STATEMENT_IF) { + print_char(' '); + print_if_statement(&f->ifs); + } else { + print_inner_statement(f); + } } } @@ -965,10 +908,15 @@ static void print_if_statement(const if_statement_t *statement) */ static void print_switch_statement(const switch_statement_t *statement) { - fputs("switch (", out); + int const old_case_indent = case_indent; + case_indent = indent; + + print_string("switch ("); print_expression(statement->expression); - fputs(") ", out); - print_statement(statement->body); + print_char(')'); + print_inner_statement(statement->body); + + case_indent = old_case_indent; } /** @@ -979,31 +927,24 @@ 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); - } - ++indent; - if (statement->statement != NULL) { - if (statement->statement->base.kind == STATEMENT_CASE_LABEL) { - --indent; - } - print_indent(); - print_statement(statement->statement); + print_string(":\n"); } + print_indented_statement(statement->statement); } 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_char(';'); } /** @@ -1032,31 +973,25 @@ 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 */"); 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; if (!first) { + print_char('\n'); print_indent(); } else { first = false; } - if (entity->kind == ENTITY_TYPEDEF) { - print_typedef(entity); - } else { - assert(is_declaration(entity)); - print_declaration(entity); - } - - fputc('\n', out); + print_entity(entity); } } @@ -1067,10 +1002,10 @@ 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_statement(statement->body); + print_char(')'); + print_inner_statement(statement->body); } /** @@ -1080,12 +1015,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_statement(statement->body); - print_indent(); - fputs("while (", out); + print_string("do"); + print_inner_statement(statement->body); + print_after_inner_statement(statement->body); + print_string("while ("); print_expression(statement->condition); - fputs(");\n", out); + print_string(");"); } /** @@ -1095,35 +1030,30 @@ 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_char(';'); } 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_char(' '); print_expression(statement->condition); } - fputc(';', out); + print_char(';'); if (statement->step != NULL) { - fputc(' ', out); + print_char(' '); print_expression(statement->step); } - fputs(") ", out); - print_statement(statement->body); + print_char(')'); + print_inner_statement(statement->body); } /** @@ -1136,15 +1066,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_char(')'); } } @@ -1158,7 +1088,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); } @@ -1171,32 +1101,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_char('('); 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(");"); } /** @@ -1206,17 +1136,17 @@ end_of_print_asm_statement: */ static void print_ms_try_statement(const ms_try_statement_t *statement) { - fputs("__try ", out); - print_statement(statement->try_statement); - print_indent(); + print_string("__try"); + print_inner_statement(statement->try_statement); + print_after_inner_statement(statement->try_statement); if (statement->except_expression != NULL) { - fputs("__except(", out); + print_string("__except("); print_expression(statement->except_expression); - fputs(") ", out); + print_char(')'); } else { - fputs("__finally ", out); + print_string("__finally"); } - print_statement(statement->final_statement); + print_inner_statement(statement->final_statement); } /** @@ -1227,7 +1157,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;"); } /** @@ -1239,7 +1169,7 @@ void print_statement(const statement_t *statement) { switch (statement->kind) { case STATEMENT_EMPTY: - fputs(";\n", out); + print_char(';'); break; case STATEMENT_COMPOUND: print_compound_statement(&statement->compound); @@ -1257,10 +1187,10 @@ void print_statement(const statement_t *statement) print_goto_statement(&statement->gotos); break; case STATEMENT_CONTINUE: - fputs("continue;\n", out); + print_string("continue;"); break; case STATEMENT_BREAK: - fputs("break;\n", out); + print_string("break;"); break; case STATEMENT_IF: print_if_statement(&statement->ifs); @@ -1292,8 +1222,8 @@ void print_statement(const statement_t *statement) case STATEMENT_LEAVE: print_leave_statement(&statement->leave); break; - case STATEMENT_INVALID: - fputs("$invalid statement$\n", out); + case STATEMENT_ERROR: + print_string("$error statement$"); break; } } @@ -1307,11 +1237,11 @@ static void print_storage_class(storage_class_tag_t storage_class) { switch (storage_class) { case STORAGE_CLASS_NONE: return; - case STORAGE_CLASS_TYPEDEF: fputs("typedef ", out); return; - case STORAGE_CLASS_EXTERN: fputs("extern ", out); return; - case STORAGE_CLASS_STATIC: fputs("static ", out); return; - case STORAGE_CLASS_AUTO: fputs("auto ", out); return; - case STORAGE_CLASS_REGISTER: fputs("register ", out); 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"); } @@ -1324,7 +1254,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; } @@ -1336,7 +1266,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) { @@ -1344,27 +1274,28 @@ 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: 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. */ @@ -1384,24 +1315,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_char(')'); } } } @@ -1409,53 +1340,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) { @@ -1463,26 +1395,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_char('\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_char(' '); } - fputs("{\n", out); + print_string("{\n"); ++indent; print_scope(&namespace->members); --indent; print_indent(); - fputs("}\n", out); + print_string("}\n"); } /** @@ -1498,43 +1430,50 @@ 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_indent(); - print_statement(entity->function.statement); + print_char('\n'); + print_indented_statement(entity->function.statement); + print_char('\n'); return; } break; 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; + case ENTITY_COMPOUND_MEMBER: + print_type_ext(declaration->type, declaration->base.symbol, NULL); + if (entity->compound_member.bitfield) { + print_format(" : %u", entity->compound_member.bit_size); + } + break; + default: print_type_ext(declaration->type, declaration->base.symbol, NULL); break; } - fputc(';', out); + print_char(';'); } /** @@ -1561,50 +1500,49 @@ 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_STRUCT: - fputs("struct ", out); - fputs(entity->base.symbol->string, out); - if (entity->structe.complete) { - fputc(' ', out); - print_compound_definition(&entity->structe); - } - fputc(';', out); + 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: - fputs("union ", out); - fputs(entity->base.symbol->string, out); - if (entity->unione.complete) { - fputc(' ', out); - print_compound_definition(&entity->unione); + print_string("union "); +print_compound: + print_string(entity->base.symbol->string); + if (entity->compound.complete) { + print_char(' '); + print_compound_definition(&entity->compound); } - fputc(';', out); + print_char(';'); 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_char(' '); print_enum_definition(&entity->enume); - fputc(';', out); + print_char(';'); return; case ENTITY_NAMESPACE: print_namespace(&entity->namespacee); return; case ENTITY_LOCAL_LABEL: - fprintf(out, "__label__ %s;", entity->base.symbol->string); + print_string("__label__ "); + print_string(entity->base.symbol->string); + print_char(';'); return; case ENTITY_LABEL: case ENTITY_ENUM_VALUE: panic("print_entity used on unexpected entity type"); - case ENTITY_INVALID: - break; } panic("Invalid entity type encountered"); } @@ -1616,8 +1554,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) @@ -1630,80 +1566,108 @@ void print_ast(const translation_unit_t *unit) print_indent(); print_entity(entity); - fputc('\n', out); + print_char('\n'); } } -bool is_constant_initializer(const initializer_t *initializer) +expression_classification_t is_constant_initializer(const initializer_t *initializer) { 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); + return is_linker_constant(initializer->value.value); - case INITIALIZER_LIST: + 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) +/** + * Checks if an expression references an object with a constant/known location + * to the linker. Example: + * - "x", "*&x" with x being a global variable. The value of x need not be + * constant but the address of x is. + * - "a.b.c" when a has a constant/known location to the linker + */ +static expression_classification_t is_object_with_linker_constant_address( + const expression_t *expression) { switch (expression->kind) { case EXPR_UNARY_DEREFERENCE: - return is_address_constant(expression->unary.value); + return is_linker_constant(expression->unary.value); case EXPR_SELECT: { type_t *base_type = skip_typeref(expression->select.compound->base.type); if (is_type_pointer(base_type)) { /* it's a -> */ - return is_address_constant(expression->select.compound); + return is_linker_constant(expression->select.compound); } else { return is_object_with_linker_constant_address(expression->select.compound); } } - case EXPR_ARRAY_ACCESS: - 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_linker_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: { entity_t *entity = expression->reference.entity; - if (is_declaration(entity)) { - switch ((storage_class_tag_t)entity->declaration.storage_class) { - case STORAGE_CLASS_NONE: - case STORAGE_CLASS_EXTERN: - case STORAGE_CLASS_STATIC: - return - entity->kind != ENTITY_VARIABLE || - !entity->variable.thread_local; - - case STORAGE_CLASS_REGISTER: - case STORAGE_CLASS_TYPEDEF: - case STORAGE_CLASS_AUTO: - break; - } + if (!is_declaration(entity)) + return EXPR_CLASS_VARIABLE; + + switch ((storage_class_tag_t)entity->declaration.storage_class) { + case STORAGE_CLASS_NONE: + case STORAGE_CLASS_EXTERN: + case STORAGE_CLASS_STATIC: + return + entity->kind != ENTITY_VARIABLE || + !entity->variable.thread_local ? EXPR_CLASS_CONSTANT : + EXPR_CLASS_VARIABLE; + + case STORAGE_CLASS_REGISTER: + case STORAGE_CLASS_TYPEDEF: + case STORAGE_CLASS_AUTO: + break; } - return false; + return EXPR_CLASS_VARIABLE; } + case EXPR_ERROR: + return EXPR_CLASS_ERROR; + default: - return false; + return EXPR_CLASS_VARIABLE; } } -bool is_address_constant(const expression_t *expression) +expression_classification_t is_linker_constant(const expression_t *expression) { switch (expression->kind) { + case EXPR_STRING_LITERAL: + case EXPR_WIDE_STRING_LITERAL: + case EXPR_FUNCNAME: + case EXPR_LABEL_ADDRESS: + return EXPR_CLASS_CONSTANT; + + case EXPR_COMPOUND_LITERAL: + return is_constant_initializer(expression->compound_literal.initializer); + case EXPR_UNARY_TAKE_ADDRESS: return is_object_with_linker_constant_address(expression->unary.value); @@ -1712,7 +1676,7 @@ bool is_address_constant(const expression_t *expression) = revert_automatic_type_conversion(expression->unary.value); /* dereferencing a function is a NOP */ if (is_type_function(real_type)) { - return is_address_constant(expression->unary.value); + return is_linker_constant(expression->unary.value); } /* FALLTHROUGH */ } @@ -1720,98 +1684,138 @@ bool is_address_constant(const expression_t *expression) 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()) + dest->kind != TYPE_ATOMIC || + !(get_atomic_type_flags(dest->atomic.akind) & ATOMIC_TYPE_FLAG_INTEGER) || + get_atomic_type_size(dest->atomic.akind) < get_type_size(type_void_ptr) )) - return false; + return is_constant_expression(expression); - return (is_constant_expression(expression->unary.value) - || is_address_constant(expression->unary.value)); + return is_linker_constant(expression->unary.value); } 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_linker_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_linker_constant(right); + return l < r ? l : r; + } else if (!is_type_valid(ltype) || !is_type_valid(rtype)) { + return EXPR_CLASS_ERROR; + } else { + return is_constant_expression(expression); } - - return false; } case EXPR_REFERENCE: { entity_t *entity = expression->reference.entity; if (!is_declaration(entity)) - return false; + return EXPR_CLASS_VARIABLE; type_t *type = skip_typeref(entity->declaration.type); if (is_type_function(type)) - return true; + return EXPR_CLASS_CONSTANT; if (is_type_array(type)) { return is_object_with_linker_constant_address(expression); } /* Prevent stray errors */ if (!is_type_valid(type)) - return true; - return false; + return EXPR_CLASS_ERROR; + return EXPR_CLASS_VARIABLE; } case EXPR_ARRAY_ACCESS: { type_t *const type = skip_typeref(revert_automatic_type_conversion(expression)); - return - is_type_array(type) && - is_constant_expression(expression->array_access.index) && - is_address_constant(expression->array_access.array_ref); + if (!is_type_array(type)) + return EXPR_CLASS_VARIABLE; + return is_linker_constant(expression->array_access.array_ref); + } + + case EXPR_CONDITIONAL: { + expression_t *const c = expression->conditional.condition; + expression_classification_t const cclass = is_constant_expression(c); + if (cclass != EXPR_CLASS_CONSTANT) + return cclass; + + if (fold_constant_to_bool(c)) { + expression_t const *const t = expression->conditional.true_expression; + return is_linker_constant(t != NULL ? t : c); + } else { + return is_linker_constant(expression->conditional.false_expression); + } + } + + case EXPR_SELECT: { + entity_t *entity = expression->select.compound_entry; + if (!is_declaration(entity)) + return EXPR_CLASS_VARIABLE; + type_t *type = skip_typeref(entity->declaration.type); + if (is_type_array(type)) { + /* arrays automatically convert to their address */ + expression_t *compound = expression->select.compound; + type_t *base_type = skip_typeref(compound->base.type); + if (is_type_pointer(base_type)) { + /* it's a -> */ + return is_linker_constant(compound); + } else { + return is_object_with_linker_constant_address(compound); + } + } + return EXPR_CLASS_VARIABLE; } default: - return false; + return is_constant_expression(expression); } } -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_inf: - case T___builtin_inff: - case T___builtin_infl: - case T___builtin_nan: - case T___builtin_nanf: - case T___builtin_nanl: - 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 BUILTIN_INF: + case BUILTIN_NAN: + 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) { case EXPR_SELECT: { @@ -1828,56 +1832,53 @@ static bool is_object_with_constant_address(const expression_t *expression) case EXPR_ARRAY_ACCESS: { array_access_expression_t const* const array_access = &expression->array_access; - return - is_constant_expression(array_access->index) && ( - is_object_with_constant_address(array_access->array_ref) || - is_constant_pointer(array_access->array_ref) - ); + 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_ERROR: + 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: + case EXPR_BUILTIN_TYPES_COMPATIBLE_P: case EXPR_REFERENCE_ENUM_VALUE: - return true; + 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_REFERENCE: case EXPR_UNARY_POSTFIX_INCREMENT: case EXPR_UNARY_POSTFIX_DECREMENT: case EXPR_UNARY_PREFIX_INCREMENT: @@ -1900,7 +1901,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); @@ -1914,10 +1920,14 @@ bool is_constant_expression(const expression_t *expression) case EXPR_UNARY_NOT: 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: { + 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: @@ -1933,8 +1943,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: @@ -1942,69 +1950,61 @@ bool is_constant_expression(const expression_t *expression) 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_INVALID: - return true; - - case EXPR_UNKNOWN: - break; + case EXPR_ERROR: + return EXPR_CLASS_ERROR; } 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); -}