X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast.c;h=cb40c3f7cee32901a5cf82dd14595241f9a74dbd;hb=093d261f7daac072333ae1f2227a73aa6dc53efd;hp=727d758c740c0e2a2b122712f7dba0d490c8ce8e;hpb=1b580cf22ca849edc62afa24304ff0432954877a;p=cparser diff --git a/ast.c b/ast.c index 727d758..cb40c3f 100644 --- a/ast.c +++ b/ast.c @@ -26,6 +26,7 @@ #include "lang_features.h" #include "entity_t.h" #include "printer.h" +#include "types.h" #include #include @@ -46,11 +47,9 @@ struct obstack ast_obstack; 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); @@ -65,7 +64,7 @@ void change_indent(int delta) void print_indent(void) { for (int i = 0; i < indent; ++i) - print_string("\t"); + print_char('\t'); } /** @@ -95,15 +94,14 @@ 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_ERROR] = 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_ENUM_CONSTANT] = PREC_PRIMARY, + [EXPR_LITERAL_INTEGER] = PREC_PRIMARY, + [EXPR_LITERAL_FLOATINGPOINT] = PREC_PRIMARY, + [EXPR_LITERAL_CHARACTER] = PREC_PRIMARY, + [EXPR_LITERAL_MS_NOOP] = PREC_PRIMARY, [EXPR_STRING_LITERAL] = PREC_PRIMARY, - [EXPR_WIDE_STRING_LITERAL] = PREC_PRIMARY, [EXPR_COMPOUND_LITERAL] = PREC_UNARY, [EXPR_CALL] = PREC_POSTFIX, [EXPR_CONDITIONAL] = PREC_CONDITIONAL, @@ -134,7 +132,6 @@ static unsigned get_expression_precedence(expression_kind_t kind) [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, @@ -185,84 +182,40 @@ static unsigned get_expression_precedence(expression_kind_t kind) 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)) { - print_string(cnst->v.int_value ? "true" : "false"); - } else if (is_type_integer(type)) { - print_format("%lld", cnst->v.int_value); - } else if (is_type_float(type)) { - long double const val = cnst->v.float_value; -#ifdef _WIN32 - /* ARG, no way to print long double */ - print_format("%.20g", (double)val); -#else - print_format("%.20Lg", val); -#endif - if (isfinite(val) && truncl(val) == val) - print_string(".0"); - } 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; - } - print_string(suffix); -} - /** * Print a quoted string constant. * * @param string the string constant * @param border the border char - * @param skip number of chars to skip at the end */ -static void print_quoted_string(const string_t *const string, char border, int skip) +static void print_quoted_string(const string_t *const string, char border) { + print_string(get_string_encoding_prefix(string->encoding)); + print_char(border); - const char *end = string->begin + string->size - skip; + const char *end = string->begin + string->size; for (const char *c = string->begin; c != end; ++c) { - unsigned char const tc = *c; + const char tc = *c; if (tc == border) { - print_string("\\"); + print_char('\\'); } switch (tc) { - case '\\': print_string("\\\\"); break; - 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 '\\': 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) { print_string("\\e"); break; } /* FALLTHROUGH */ default: - if (tc < 0x80 && !isprint(tc)) { + if ((unsigned)tc < 0x80 && !isprint(tc)) { print_format("\\%03o", (unsigned)tc); } else { print_char(tc); @@ -273,77 +226,28 @@ static void print_quoted_string(const string_t *const string, char border, int s 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) +static void print_string_literal(string_literal_expression_t const *const literal, char const delimiter) { - print_string("L"); - print_char(border); - const wchar_rep_t *end = wstr->begin + wstr->size - skip; - for (const wchar_rep_t *c = wstr->begin; c != end; ++c) { - switch (*c) { - case L'\"': print_string("\\\""); break; - case L'\\': print_string("\\\\"); break; - case L'\a': print_string("\\a"); break; - case L'\b': print_string("\\b"); break; - case L'\f': print_string("\\f"); break; - case L'\n': print_string("\\n"); break; - case L'\r': print_string("\\r"); break; - case L'\t': print_string("\\t"); break; - case L'\v': print_string("\\v"); break; - case L'\?': print_string("\\?"); break; - case 27: - if (c_mode & _GNUC) { - print_string("\\e"); break; - } - /* FALLTHROUGH */ - default: { - const unsigned tc = *c; - if (tc < 0x80U) { - if (isprint(*c)) { - print_char(*c); - } else { - print_format("\\%03o", tc); - } - } else { - print_char(tc); - } - } - } - } - print_char(border); + print_quoted_string(&literal->value, delimiter); } -/** - * Print a constant character expression. - * - * @param cnst the constant character expression - */ -static void print_character_constant(const const_expression_t *cnst) +static void print_literal(const literal_expression_t *literal) { - print_quoted_string(&cnst->v.character, '\'', 0); -} + switch (literal->base.kind) { + case EXPR_LITERAL_MS_NOOP: + print_string("__noop"); + return; -static void print_wide_character_constant(const const_expression_t *cnst) -{ - print_quoted_wide_string(&cnst->v.wide_character, '\'', 0); -} + case EXPR_LITERAL_BOOLEAN: + case EXPR_LITERAL_FLOATINGPOINT: + case EXPR_LITERAL_INTEGER: + print_string(literal->value.begin); + return; -/** - * Prints a string literal expression. - * - * @param string_literal the string literal expression - */ -static void print_string_literal( - const string_literal_expression_t *string_literal) -{ - print_quoted_string(&string_literal->value, '"', 1); + default: + break; + } + print_string("INVALID LITERAL KIND"); } /** @@ -361,18 +265,12 @@ static void print_funcname(const funcname_expression_t *funcname) print_string(s); } -static void print_wide_string_literal( - const wide_string_literal_expression_t *const wstr) -{ - print_quoted_wide_string(&wstr->value, '"', 1); -} - static void print_compound_literal( const compound_literal_expression_t *expression) { - print_string("("); + print_char('('); print_type(expression->type); - print_string(")"); + print_char(')'); print_initializer(expression->initializer); } @@ -389,20 +287,14 @@ static void print_assignment_expression(const expression_t *const expr) static void print_call_expression(const call_expression_t *call) { print_expression_prec(call->function, PREC_POSTFIX); - print_string("("); - call_argument_t *argument = call->arguments; - int first = 1; - while (argument != NULL) { - if (!first) { - print_string(", "); - } else { - first = 0; - } - print_assignment_expression(argument->expression); - - argument = argument->next; + print_char('('); + char const *sep = ""; + for (call_argument_t const *arg = call->arguments; arg; arg = arg->next) { + print_string(sep); + sep = ", "; + print_assignment_expression(arg->expression); } - print_string(")"); + print_char(')'); } /** @@ -464,14 +356,14 @@ static void print_unary_expression(const unary_expression_t *unexpr) { unsigned prec = get_expression_precedence(unexpr->base.kind); switch (unexpr->base.kind) { - case EXPR_UNARY_NEGATE: 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_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_string("*"); break; - case EXPR_UNARY_TAKE_ADDRESS: 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; @@ -483,16 +375,15 @@ static void print_unary_expression(const unary_expression_t *unexpr) print_expression_prec(unexpr->value, prec); print_string("--"); return; - case EXPR_UNARY_CAST_IMPLICIT: case EXPR_UNARY_CAST: - print_string("("); + print_char('('); print_type(unexpr->base.type); - print_string(")"); + print_char(')'); break; case EXPR_UNARY_ASSUME: print_string("__assume("); print_assignment_expression(unexpr->value); - print_string(")"); + print_char(')'); return; case EXPR_UNARY_THROW: @@ -538,14 +429,14 @@ static void print_array_expression(const array_access_expression_t *expression) { if (!expression->flipped) { print_expression_prec(expression->array_ref, PREC_POSTFIX); - print_string("["); + print_char('['); print_expression(expression->index); - print_string("]"); + print_char(']'); } else { print_expression_prec(expression->index, PREC_POSTFIX); - print_string("["); + print_char('['); print_expression(expression->array_ref); - print_string("]"); + print_char(']'); } } @@ -556,19 +447,18 @@ static void print_array_expression(const array_access_expression_t *expression) */ static void print_typeprop_expression(const typeprop_expression_t *expression) { - if (expression->base.kind == EXPR_SIZEOF) { - print_string("sizeof"); - } else { - assert(expression->base.kind == EXPR_ALIGNOF); - print_string("__alignof__"); + switch (expression->base.kind) { + case EXPR_SIZEOF: print_string("sizeof"); break; + case EXPR_ALIGNOF: print_string("__alignof__"); break; + default: panic("invalid typeprop kind"); } if (expression->tp_expression != NULL) { /* PREC_TOP: always print the '()' here, sizeof x is right but unusual */ print_expression_prec(expression->tp_expression, PREC_TOP); } else { - print_string("("); + print_char('('); print_type(expression->type); - print_string(")"); + print_char(')'); } } @@ -581,7 +471,7 @@ static void print_builtin_constant(const builtin_constant_expression_t *expressi { print_string("__builtin_constant_p("); print_assignment_expression(expression->value); - print_string(")"); + print_char(')'); } /** @@ -596,7 +486,7 @@ static void print_builtin_types_compatible( print_type(expression->left); print_string(", "); print_type(expression->right); - print_string(")"); + print_char(')'); } /** @@ -628,8 +518,8 @@ static void print_va_start(const va_start_expression_t *const expression) print_string("__builtin_va_start("); print_assignment_expression(expression->ap); print_string(", "); - print_string(expression->parameter->base.base.symbol->string); - print_string(")"); + print_assignment_expression(expression->parameter); + print_char(')'); } /** @@ -643,7 +533,7 @@ static void print_va_arg(const va_arg_expression_t *expression) print_assignment_expression(expression->ap); print_string(", "); print_type(expression->base.type); - print_string(")"); + print_char(')'); } /** @@ -657,7 +547,7 @@ static void print_va_copy(const va_copy_expression_t *expression) print_assignment_expression(expression->dst); print_string(", "); print_assignment_expression(expression->src); - print_string(")"); + print_char(')'); } /** @@ -668,10 +558,16 @@ static void print_va_copy(const va_copy_expression_t *expression) static void print_select(const select_expression_t *expression) { print_expression_prec(expression->compound, PREC_POSTFIX); + /* do not print anything for anonymous struct/union selects + * FIXME: if the anonymous select was a '->' this will print '.' + */ + if (expression->compound_entry->base.symbol == NULL) + return; + if (is_type_pointer(skip_typeref(expression->compound->base.type))) { print_string("->"); } else { - print_string("."); + print_char('.'); } print_string(expression->compound_entry->base.symbol->string); } @@ -686,7 +582,7 @@ static void print_classify_type_expression( { print_string("__builtin_classify_type("); print_assignment_expression(expr->type_expression); - print_string(")"); + print_char(')'); } /** @@ -698,11 +594,11 @@ static void print_designator(const designator_t *designator) { for ( ; designator != NULL; designator = designator->next) { if (designator->symbol == NULL) { - print_string("["); + print_char('['); print_expression(designator->array_index); - print_string("]"); + print_char(']'); } else { - print_string("."); + print_char('.'); print_string(designator->symbol->string); } } @@ -717,9 +613,9 @@ static void print_offsetof_expression(const offsetof_expression_t *expression) { print_string("__builtin_offsetof("); print_type(expression->type); - print_string(","); + print_char(','); print_designator(expression->designator); - print_string(")"); + print_char(')'); } /** @@ -729,9 +625,36 @@ static void print_offsetof_expression(const offsetof_expression_t *expression) */ static void print_statement_expression(const statement_expression_t *expression) { - print_string("("); + print_char('('); print_statement(expression->statement); - print_string(")"); + print_char(')'); +} + +static bool needs_parentheses(expression_t const *const expr, unsigned const top_prec) +{ + if (expr->base.parenthesized) + return true; + + if (top_prec > get_expression_precedence(expr->base.kind)) + return true; + + if (print_parenthesis && top_prec != PREC_BOTTOM) { + switch (expr->kind) { + case EXPR_ENUM_CONSTANT: + case EXPR_FUNCNAME: + case EXPR_LITERAL_CASES: + case EXPR_LITERAL_CHARACTER: + case EXPR_REFERENCE: + case EXPR_STRING_LITERAL: + /* Do not print () around subexpressions consisting of a single token. */ + return false; + + default: + return true; + } + } + + return false; } /** @@ -740,106 +663,63 @@ static void print_statement_expression(const statement_expression_t *expression) * @param expression the expression to print * @param top_prec the precedence of the user of this expression. */ -static void print_expression_prec(const expression_t *expression, unsigned top_prec) +static void print_expression_prec(expression_t const *expr, unsigned const top_prec) { - if (expression->kind == EXPR_UNARY_CAST_IMPLICIT && !print_implicit_casts) { - expression = expression->unary.value; + if (expr->kind == EXPR_UNARY_CAST && expr->base.implicit && !print_implicit_casts) { + expr = expr->unary.value; } - bool parenthesized = - expression->base.parenthesized || - (print_parenthesis && top_prec != PREC_BOTTOM) || - top_prec > get_expression_precedence(expression->base.kind); + bool const parenthesized = needs_parentheses(expr, top_prec); if (parenthesized) - print_string("("); - switch (expression->kind) { - case EXPR_UNKNOWN: - case EXPR_INVALID: - print_string("$invalid expression$"); - break; - case EXPR_CHARACTER_CONSTANT: - print_character_constant(&expression->conste); - break; - case EXPR_WIDE_CHARACTER_CONSTANT: - print_wide_character_constant(&expression->conste); - break; - case EXPR_CONST: - print_const(&expression->conste); - 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; - case EXPR_CALL: - print_call_expression(&expression->call); - break; - EXPR_BINARY_CASES - print_binary_expression(&expression->binary); - break; - case EXPR_REFERENCE: - case EXPR_REFERENCE_ENUM_VALUE: - print_reference_expression(&expression->reference); - break; - case EXPR_ARRAY_ACCESS: - print_array_expression(&expression->array_access); - break; - case EXPR_LABEL_ADDRESS: - print_label_address_expression(&expression->label_address); - break; - EXPR_UNARY_CASES - print_unary_expression(&expression->unary); - break; - case EXPR_SIZEOF: + print_char('('); + switch (expr->kind) { case EXPR_ALIGNOF: - print_typeprop_expression(&expression->typeprop); - break; - case EXPR_BUILTIN_CONSTANT_P: - print_builtin_constant(&expression->builtin_constant); - break; - case EXPR_BUILTIN_TYPES_COMPATIBLE_P: - print_builtin_types_compatible(&expression->builtin_types_compatible); - break; - case EXPR_CONDITIONAL: - print_conditional(&expression->conditional); - break; - case EXPR_VA_START: - print_va_start(&expression->va_starte); - break; - case EXPR_VA_ARG: - print_va_arg(&expression->va_arge); - break; - case EXPR_VA_COPY: - print_va_copy(&expression->va_copye); - break; - case EXPR_SELECT: - print_select(&expression->select); - break; - case EXPR_CLASSIFY_TYPE: - print_classify_type_expression(&expression->classify_type); - break; - case EXPR_OFFSETOF: - print_offsetof_expression(&expression->offsetofe); + case EXPR_SIZEOF: print_typeprop_expression( &expr->typeprop); break; + case EXPR_ARRAY_ACCESS: print_array_expression( &expr->array_access); break; + case EXPR_BINARY_CASES: print_binary_expression( &expr->binary); break; + case EXPR_BUILTIN_CONSTANT_P: print_builtin_constant( &expr->builtin_constant); break; + case EXPR_BUILTIN_TYPES_COMPATIBLE_P: print_builtin_types_compatible(&expr->builtin_types_compatible); break; + case EXPR_CALL: print_call_expression( &expr->call); break; + case EXPR_CLASSIFY_TYPE: print_classify_type_expression(&expr->classify_type); break; + case EXPR_COMPOUND_LITERAL: print_compound_literal( &expr->compound_literal); break; + case EXPR_CONDITIONAL: print_conditional( &expr->conditional); break; + case EXPR_ERROR: print_string("$error$"); break; + case EXPR_FUNCNAME: print_funcname( &expr->funcname); break; + case EXPR_LABEL_ADDRESS: print_label_address_expression(&expr->label_address); break; + case EXPR_LITERAL_CASES: print_literal( &expr->literal); break; + case EXPR_LITERAL_CHARACTER: print_string_literal( &expr->string_literal, '\''); break; + case EXPR_OFFSETOF: print_offsetof_expression( &expr->offsetofe); break; + case EXPR_REFERENCE: + case EXPR_ENUM_CONSTANT: print_reference_expression( &expr->reference); break; + case EXPR_SELECT: print_select( &expr->select); break; + case EXPR_STATEMENT: print_statement_expression( &expr->statement); break; + case EXPR_STRING_LITERAL: print_string_literal( &expr->string_literal, '"'); break; + case EXPR_UNARY_CASES: print_unary_expression( &expr->unary); break; + case EXPR_VA_ARG: print_va_arg( &expr->va_arge); break; + case EXPR_VA_COPY: print_va_copy( &expr->va_copye); break; + case EXPR_VA_START: print_va_start( &expr->va_starte); break; + } + if (parenthesized) + print_char(')'); +} + +static void print_indented_statement(statement_t const *const stmt) +{ + switch (stmt->kind) { + case STATEMENT_LABEL: break; - case EXPR_STATEMENT: - print_statement_expression(&expression->statement); + + case STATEMENT_CASE_LABEL: + for (int i = 0; i != case_indent; ++i) + print_char('\t'); break; default: - /* TODO */ - print_format("some expression of type %d", (int)expression->kind); + print_indent(); break; } - if (parenthesized) - print_string(")"); + print_statement(stmt); } /** @@ -852,19 +732,14 @@ static void print_compound_statement(const compound_statement_t *block) print_string("{\n"); ++indent; - statement_t *statement = block->statements; - while (statement != NULL) { - if (statement->base.kind == STATEMENT_CASE_LABEL) - --indent; - if (statement->kind != STATEMENT_LABEL) - print_indent(); - print_statement(statement); - - statement = statement->base.next; + for (statement_t const *stmt = block->statements; stmt; stmt = stmt->base.next) { + print_indented_statement(stmt); + print_char('\n'); } + --indent; print_indent(); - print_string(block->stmt_expr ? "}" : "}\n"); + print_char('}'); } /** @@ -878,9 +753,9 @@ static void print_return_statement(const return_statement_t *statement) if (val != NULL) { print_string("return "); print_expression(val); - print_string(";\n"); + print_char(';'); } else { - print_string("return;\n"); + print_string("return;"); } } @@ -892,7 +767,19 @@ static void print_return_statement(const return_statement_t *statement) static void print_expression_statement(const expression_statement_t *statement) { print_expression(statement->expression); - print_string(";\n"); + print_char(';'); +} + +/** + * Print a computed goto statement. + * + * @param statement the computed goto statement + */ +static void print_computed_goto_statement(computed_goto_statement_t const *const stmt) +{ + print_string("goto *"); + print_expression(stmt->expression); + print_char(';'); } /** @@ -903,13 +790,8 @@ static void print_expression_statement(const expression_statement_t *statement) static void print_goto_statement(const goto_statement_t *statement) { print_string("goto "); - if (statement->expression != NULL) { - print_string("*"); - print_expression(statement->expression); - } else { - print_string(statement->label->base.symbol->string); - } - print_string(";\n"); + print_string(statement->label->base.symbol->string); + print_char(';'); } /** @@ -920,8 +802,30 @@ static void print_goto_statement(const goto_statement_t *statement) static void print_label_statement(const label_statement_t *statement) { print_format("%s:\n", statement->label->base.symbol->string); - print_indent(); - print_statement(statement->statement); + print_indented_statement(statement->statement); +} + +static void print_inner_statement(statement_t const *const stmt) +{ + if (stmt->kind == STATEMENT_COMPOUND) { + print_char(' '); + print_compound_statement(&stmt->compound); + } else { + print_char('\n'); + ++indent; + print_indented_statement(stmt); + --indent; + } +} + +static void print_after_inner_statement(statement_t const *const stmt) +{ + if (stmt->kind == STATEMENT_COMPOUND) { + print_char(' '); + } else { + print_char('\n'); + print_indent(); + } } /** @@ -933,13 +837,19 @@ static void print_if_statement(const if_statement_t *statement) { print_string("if ("); print_expression(statement->condition); - print_string(") "); - print_statement(statement->true_statement); - - if (statement->false_statement != NULL) { - print_indent(); - print_string("else "); - print_statement(statement->false_statement); + print_char(')'); + print_inner_statement(statement->true_statement); + + statement_t const *const f = statement->false_statement; + if (f) { + print_after_inner_statement(statement->true_statement); + print_string("else"); + if (f->kind == STATEMENT_IF) { + print_char(' '); + print_if_statement(&f->ifs); + } else { + print_inner_statement(f); + } } } @@ -950,10 +860,15 @@ static void print_if_statement(const if_statement_t *statement) */ static void print_switch_statement(const switch_statement_t *statement) { + int const old_case_indent = case_indent; + case_indent = indent; + print_string("switch ("); print_expression(statement->expression); - print_string(") "); - print_statement(statement->body); + print_char(')'); + print_inner_statement(statement->body); + + case_indent = old_case_indent; } /** @@ -974,21 +889,14 @@ static void print_case_label(const case_label_statement_t *statement) } print_string(":\n"); } - ++indent; - if (statement->statement != NULL) { - if (statement->statement->base.kind == STATEMENT_CASE_LABEL) { - --indent; - } - print_indent(); - print_statement(statement->statement); - } + print_indented_statement(statement->statement); } static void print_typedef(const entity_t *entity) { print_string("typedef "); print_type_ext(entity->typedefe.type, entity->base.symbol, NULL); - print_string(";"); + print_char(';'); } /** @@ -1017,7 +925,7 @@ static void print_declaration_statement( bool first = true; entity_t *entity = statement->declarations_begin; if (entity == NULL) { - print_string("/* empty declaration statement */\n"); + print_string("/* empty declaration statement */"); return; } @@ -1029,13 +937,13 @@ static void print_declaration_statement( continue; if (!first) { + print_char('\n'); print_indent(); } else { first = false; } print_entity(entity); - print_string("\n"); } } @@ -1048,8 +956,8 @@ static void print_while_statement(const while_statement_t *statement) { print_string("while ("); print_expression(statement->condition); - print_string(") "); - print_statement(statement->body); + print_char(')'); + print_inner_statement(statement->body); } /** @@ -1059,12 +967,12 @@ static void print_while_statement(const while_statement_t *statement) */ static void print_do_while_statement(const do_while_statement_t *statement) { - print_string("do "); - print_statement(statement->body); - print_indent(); + print_string("do"); + print_inner_statement(statement->body); + print_after_inner_statement(statement->body); print_string("while ("); print_expression(statement->condition); - print_string(");\n"); + print_string(");"); } /** @@ -1077,7 +985,7 @@ static void print_for_statement(const for_statement_t *statement) print_string("for ("); if (statement->initialisation != NULL) { print_expression(statement->initialisation); - print_string(";"); + print_char(';'); } else { entity_t const *entity = statement->scope.entities; for (; entity != NULL; entity = entity->base.next) { @@ -1088,16 +996,16 @@ static void print_for_statement(const for_statement_t *statement) } } if (statement->condition != NULL) { - print_string(" "); + print_char(' '); print_expression(statement->condition); } - print_string(";"); + print_char(';'); if (statement->step != NULL) { - print_string(" "); + print_char(' '); print_expression(statement->step); } - print_string(") "); - print_statement(statement->body); + print_char(')'); + print_inner_statement(statement->body); } /** @@ -1115,10 +1023,10 @@ static void print_asm_arguments(asm_argument_t *arguments) if (argument->symbol) { print_format("[%s] ", argument->symbol->string); } - print_quoted_string(&argument->constraints, '"', 1); + print_quoted_string(&argument->constraints, '"'); print_string(" ("); print_expression(argument->expression); - print_string(")"); + print_char(')'); } } @@ -1134,7 +1042,7 @@ static void print_asm_clobbers(asm_clobber_t *clobbers) if (clobber != clobbers) print_string(", "); - print_quoted_string(&clobber->clobber, '"', 1); + print_quoted_string(&clobber->clobber, '"'); } } @@ -1149,8 +1057,8 @@ static void print_asm_statement(const asm_statement_t *statement) if (statement->is_volatile) { print_string("volatile "); } - print_string("("); - print_quoted_string(&statement->asm_text, '"', 1); + print_char('('); + print_quoted_string(&statement->asm_text, '"'); if (statement->outputs == NULL && statement->inputs == NULL && statement->clobbers == NULL) @@ -1170,7 +1078,7 @@ static void print_asm_statement(const asm_statement_t *statement) print_asm_clobbers(statement->clobbers); end_of_print_asm_statement: - print_string(");\n"); + print_string(");"); } /** @@ -1180,17 +1088,17 @@ end_of_print_asm_statement: */ static void print_ms_try_statement(const ms_try_statement_t *statement) { - print_string("__try "); - print_statement(statement->try_statement); - print_indent(); + print_string("__try"); + print_inner_statement(statement->try_statement); + print_after_inner_statement(statement->try_statement); if (statement->except_expression != NULL) { print_string("__except("); print_expression(statement->except_expression); - print_string(") "); + print_char(')'); } else { - print_string("__finally "); + print_string("__finally"); } - print_statement(statement->final_statement); + print_inner_statement(statement->final_statement); } /** @@ -1201,7 +1109,7 @@ static void print_ms_try_statement(const ms_try_statement_t *statement) static void print_leave_statement(const leave_statement_t *statement) { (void)statement; - print_string("__leave;\n"); + print_string("__leave;"); } /** @@ -1209,66 +1117,29 @@ static void print_leave_statement(const leave_statement_t *statement) * * @param statement the statement */ -void print_statement(const statement_t *statement) -{ - switch (statement->kind) { - case STATEMENT_EMPTY: - print_string(";\n"); - break; - case STATEMENT_COMPOUND: - print_compound_statement(&statement->compound); - break; - case STATEMENT_RETURN: - print_return_statement(&statement->returns); - break; - case STATEMENT_EXPRESSION: - print_expression_statement(&statement->expression); - break; - case STATEMENT_LABEL: - print_label_statement(&statement->label); - break; - case STATEMENT_GOTO: - print_goto_statement(&statement->gotos); - break; - case STATEMENT_CONTINUE: - print_string("continue;\n"); - break; - case STATEMENT_BREAK: - print_string("break;\n"); - break; - case STATEMENT_IF: - print_if_statement(&statement->ifs); - break; - case STATEMENT_SWITCH: - print_switch_statement(&statement->switchs); - break; - case STATEMENT_CASE_LABEL: - print_case_label(&statement->case_label); - break; - case STATEMENT_DECLARATION: - print_declaration_statement(&statement->declaration); - break; - case STATEMENT_WHILE: - print_while_statement(&statement->whiles); - break; - case STATEMENT_DO_WHILE: - print_do_while_statement(&statement->do_while); - break; - case STATEMENT_FOR: - print_for_statement(&statement->fors); - break; - case STATEMENT_ASM: - print_asm_statement(&statement->asms); - break; - case STATEMENT_MS_TRY: - print_ms_try_statement(&statement->ms_try); - break; - case STATEMENT_LEAVE: - print_leave_statement(&statement->leave); - break; - case STATEMENT_INVALID: - print_string("$invalid statement$\n"); - break; +void print_statement(statement_t const *const stmt) +{ + switch (stmt->kind) { + case STATEMENT_ASM: print_asm_statement( &stmt->asms); break; + case STATEMENT_BREAK: print_string("break;"); break; + case STATEMENT_CASE_LABEL: print_case_label( &stmt->case_label); break; + case STATEMENT_COMPOUND: print_compound_statement( &stmt->compound); break; + case STATEMENT_COMPUTED_GOTO: print_computed_goto_statement(&stmt->computed_goto); break; + case STATEMENT_CONTINUE: print_string("continue;"); break; + case STATEMENT_DECLARATION: print_declaration_statement( &stmt->declaration); break; + case STATEMENT_DO_WHILE: print_do_while_statement( &stmt->do_while); break; + case STATEMENT_EMPTY: print_char(';'); break; + case STATEMENT_ERROR: print_string("$error statement$"); break; + case STATEMENT_EXPRESSION: print_expression_statement( &stmt->expression); break; + case STATEMENT_FOR: print_for_statement( &stmt->fors); break; + case STATEMENT_GOTO: print_goto_statement( &stmt->gotos); break; + case STATEMENT_IF: print_if_statement( &stmt->ifs); break; + case STATEMENT_LABEL: print_label_statement( &stmt->label); break; + case STATEMENT_LEAVE: print_leave_statement( &stmt->leave); break; + case STATEMENT_MS_TRY: print_ms_try_statement( &stmt->ms_try); break; + case STATEMENT_RETURN: print_return_statement( &stmt->returns); break; + case STATEMENT_SWITCH: print_switch_statement( &stmt->switchs); break; + case STATEMENT_WHILE: print_while_statement( &stmt->whiles); break; } } @@ -1303,13 +1174,12 @@ void print_initializer(const initializer_t *initializer) } switch (initializer->kind) { - case INITIALIZER_VALUE: { - const initializer_value_t *value = &initializer->value; - print_assignment_expression(value->value); + case INITIALIZER_STRING: + case INITIALIZER_VALUE: + print_assignment_expression(initializer->value.value); return; - } + case INITIALIZER_LIST: { - assert(initializer->kind == INITIALIZER_LIST); print_string("{ "); const initializer_list_t *list = &initializer->list; @@ -1324,12 +1194,7 @@ void print_initializer(const initializer_t *initializer) print_string(" }"); return; } - case INITIALIZER_STRING: - print_quoted_string(&initializer->string.string, '"', 1); - return; - case INITIALIZER_WIDE_STRING: - print_quoted_wide_string(&initializer->wide_string.string, '"', 1); - return; + case INITIALIZER_DESIGNATOR: print_designator(initializer->designator.designator); print_string(" = "); @@ -1376,7 +1241,7 @@ static void print_ms_modifiers(const declaration_t *declaration) } if (variable->put_property_sym != NULL) print_format("%sput=%s", comma, variable->put_property_sym->string); - print_string(")"); + print_char(')'); } } } @@ -1439,7 +1304,7 @@ static void print_scope(const scope_t *scope) for ( ; entity != NULL; entity = entity->base.next) { print_indent(); print_entity(entity); - print_string("\n"); + print_char('\n'); } } @@ -1448,7 +1313,7 @@ static void print_namespace(const namespace_t *namespace) print_string("namespace "); if (namespace->base.symbol != NULL) { print_string(namespace->base.symbol->string); - print_string(" "); + print_char(' '); } print_string("{\n"); @@ -1489,9 +1354,9 @@ void print_declaration(const entity_t *entity) &entity->function.parameters); if (entity->function.statement != NULL) { - print_string("\n"); - print_indent(); - print_statement(entity->function.statement); + print_char('\n'); + print_indented_statement(entity->function.statement); + print_char('\n'); return; } break; @@ -1506,11 +1371,18 @@ void print_declaration(const entity_t *entity) } break; + case ENTITY_COMPOUND_MEMBER: + print_type_ext(declaration->type, declaration->base.symbol, NULL); + if (entity->compound_member.bitfield) { + print_format(" : %u", entity->compound_member.bit_size); + } + break; + default: print_type_ext(declaration->type, declaration->base.symbol, NULL); break; } - print_string(";"); + print_char(';'); } /** @@ -1551,28 +1423,23 @@ void print_entity(const entity_t *entity) return; case ENTITY_STRUCT: print_string("struct "); - print_string(entity->base.symbol->string); - if (entity->structe.complete) { - print_string(" "); - print_compound_definition(&entity->structe); - } - print_string(";"); - return; + goto print_compound; case ENTITY_UNION: print_string("union "); +print_compound: print_string(entity->base.symbol->string); - if (entity->unione.complete) { - print_string(" "); - print_compound_definition(&entity->unione); + if (entity->compound.complete) { + print_char(' '); + print_compound_definition(&entity->compound); } - print_string(";"); + print_char(';'); return; case ENTITY_ENUM: print_string("enum "); print_string(entity->base.symbol->string); - print_string(" "); + print_char(' '); print_enum_definition(&entity->enume); - print_string(";"); + print_char(';'); return; case ENTITY_NAMESPACE: print_namespace(&entity->namespacee); @@ -1580,13 +1447,11 @@ void print_entity(const entity_t *entity) case ENTITY_LOCAL_LABEL: print_string("__label__ "); print_string(entity->base.symbol->string); - print_string(";"); + print_char(';'); return; case ENTITY_LABEL: case ENTITY_ENUM_VALUE: panic("print_entity used on unexpected entity type"); - case ENTITY_INVALID: - break; } panic("Invalid entity type encountered"); } @@ -1610,85 +1475,105 @@ void print_ast(const translation_unit_t *unit) print_indent(); print_entity(entity); - print_string("\n"); + 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 true; + 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); @@ -1698,7 +1583,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 */ } @@ -1706,71 +1591,97 @@ 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; - if (!is_constant_expression(c)) - return false; + 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); + return is_linker_constant(t != NULL ? t : c); } else { - return is_address_constant(expression->conditional.false_expression); + return is_linker_constant(expression->conditional.false_expression); } } + case EXPR_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); } } @@ -1778,44 +1689,40 @@ bool is_address_constant(const expression_t *expression) * Check if the given expression is a call to a builtin function * returning a constant result. */ -static bool is_builtin_const_call(const expression_t *expression) +static expression_classification_t is_builtin_const_call(const expression_t *expression) { expression_t *function = expression->call.function; if (function->kind != EXPR_REFERENCE) - return false; + return EXPR_CLASS_VARIABLE; reference_expression_t *ref = &function->reference; if (ref->entity->kind != ENTITY_FUNCTION) - return false; + return EXPR_CLASS_VARIABLE; switch (ref->entity->function.btk) { - case bk_gnu_builtin_huge_val: - case bk_gnu_builtin_inf: - case bk_gnu_builtin_inff: - case bk_gnu_builtin_infl: - case bk_gnu_builtin_nan: - case bk_gnu_builtin_nanf: - case bk_gnu_builtin_nanl: - return true; + case BUILTIN_INF: + case BUILTIN_NAN: + return EXPR_CLASS_CONSTANT; default: - return false; + return EXPR_CLASS_VARIABLE; } } -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: { @@ -1832,42 +1739,46 @@ 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_LITERAL_CASES: + case EXPR_LITERAL_CHARACTER: case EXPR_CLASSIFY_TYPE: case EXPR_OFFSETOF: case EXPR_ALIGNOF: case EXPR_BUILTIN_CONSTANT_P: case EXPR_BUILTIN_TYPES_COMPATIBLE_P: - case EXPR_REFERENCE_ENUM_VALUE: - return true; + case EXPR_ENUM_CONSTANT: + return EXPR_CLASS_CONSTANT; case EXPR_SIZEOF: { type_t *const type = skip_typeref(expression->typeprop.type); - return !is_type_array(type) || !type->array.is_vla; + return + !is_type_array(type) || !type->array.is_vla ? EXPR_CLASS_CONSTANT : + EXPR_CLASS_VARIABLE; } case EXPR_STRING_LITERAL: - case EXPR_WIDE_STRING_LITERAL: case EXPR_FUNCNAME: case EXPR_LABEL_ADDRESS: case EXPR_SELECT: @@ -1875,7 +1786,6 @@ bool is_constant_expression(const expression_t *expression) 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: @@ -1898,7 +1808,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); @@ -1912,10 +1827,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: @@ -1938,25 +1857,29 @@ 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; - if (!is_constant_expression(left)) - return false; - if (fold_constant_to_bool(left) == false) - return true; + 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; - if (!is_constant_expression(left)) - return false; - if (fold_constant_to_bool(left) == true) - return true; + 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); } @@ -1964,51 +1887,31 @@ bool is_constant_expression(const expression_t *expression) return is_constant_initializer(expression->compound_literal.initializer); case EXPR_CONDITIONAL: { - expression_t *condition = expression->conditional.condition; - if (!is_constant_expression(condition)) - return false; + 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) == true) { + if (fold_constant_to_bool(condition)) { expression_t const *const t = expression->conditional.true_expression; - return t == NULL || is_constant_expression(t); + 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); } - -/** - * 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); -}