X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast.c;h=164c8646160d7790595f0eb173371c4f93cdb37a;hb=e1487550e8addd019fea3810b59aaa57a26c0471;hp=f02dc668a37122a5b76d3f71c3a7eae40cd6a025;hpb=c58c01e7c180f68d3d3a721997693abcc6e26352;p=cparser diff --git a/ast.c b/ast.c index f02dc66..164c864 100644 --- a/ast.c +++ b/ast.c @@ -24,6 +24,7 @@ #include "type_t.h" #include "parser.h" #include "lang_features.h" +#include "entity_t.h" #include #include @@ -64,37 +65,23 @@ void print_indent(void) fputc('\t', out); } -enum precedence_t { - PREC_BOTTOM = 0, - PREC_EXPR = 2, - PREC_COMMA = 4, /* , left to right */ - PREC_ASSIGN = 6, /* = += -= *= /= %= <<= >>= &= ^= |= right to left */ - PREC_COND = 8, /* ?: right to left */ - PREC_LOG_OR = 10, /* || left to right */ - PREC_LOG_AND = 12, /* && left to right */ - PREC_BIT_OR = 14, /* | left to right */ - PREC_BIT_XOR = 16, /* ^ left to right */ - PREC_BIT_AND = 18, /* & left to right */ - PREC_EQ = 20, /* == != left to right */ - PREC_CMP = 22, /* < <= > >= left to right */ - PREC_SHF = 24, /* << >> left to right */ - PREC_PLUS = 26, /* + - left to right */ - PREC_MUL = 28, /* * / % left to right */ - PREC_UNARY = 30, /* ! ~ ++ -- + - (type) * & sizeof right to left */ - PREC_ACCESS = 32, /* () [] -> . left to right */ - PREC_PRIM = 34, /* primary */ - PREC_TOP = 36 -}; - /** * Returns 1 if a given precedence level has right-to-left - * associativity, else -1. + * associativity, else 0. * * @param precedence the operator precedence */ -static int right_to_left(unsigned precedence) { - return (precedence == PREC_ASSIGN || precedence == PREC_COND || - precedence == PREC_UNARY) ? 1 : -1; +static int right_to_left(unsigned precedence) +{ + switch (precedence) { + case 2*PREC_ASSIGNMENT: + case 2*PREC_CONDITIONAL: + case 2*PREC_UNARY: + return 1; + + default: + return 0; + } } /** @@ -105,32 +92,33 @@ static int right_to_left(unsigned precedence) { static unsigned get_expression_precedence(expression_kind_t kind) { static const unsigned prec[] = { - [EXPR_UNKNOWN] = PREC_PRIM, - [EXPR_INVALID] = PREC_PRIM, - [EXPR_REFERENCE] = PREC_PRIM, - [EXPR_CHARACTER_CONSTANT] = PREC_PRIM, - [EXPR_WIDE_CHARACTER_CONSTANT] = PREC_PRIM, - [EXPR_CONST] = PREC_PRIM, - [EXPR_STRING_LITERAL] = PREC_PRIM, - [EXPR_WIDE_STRING_LITERAL] = PREC_PRIM, + [EXPR_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_ACCESS, - [EXPR_CONDITIONAL] = PREC_COND, - [EXPR_SELECT] = PREC_ACCESS, - [EXPR_ARRAY_ACCESS] = PREC_ACCESS, + [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_PRIM, - [EXPR_BUILTIN_SYMBOL] = PREC_PRIM, - [EXPR_BUILTIN_CONSTANT_P] = PREC_PRIM, - [EXPR_BUILTIN_PREFETCH] = PREC_PRIM, - [EXPR_OFFSETOF] = PREC_PRIM, - [EXPR_VA_START] = PREC_PRIM, - [EXPR_VA_ARG] = PREC_PRIM, - [EXPR_STATEMENT] = PREC_ACCESS, - [EXPR_LABEL_ADDRESS] = PREC_PRIM, + [EXPR_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, @@ -144,52 +132,56 @@ static unsigned get_expression_precedence(expression_kind_t kind) [EXPR_UNARY_PREFIX_DECREMENT] = PREC_UNARY, [EXPR_UNARY_CAST] = PREC_UNARY, [EXPR_UNARY_CAST_IMPLICIT] = PREC_UNARY, - [EXPR_UNARY_ASSUME] = PREC_PRIM, - - [EXPR_BINARY_ADD] = PREC_PLUS, - [EXPR_BINARY_SUB] = PREC_PLUS, - [EXPR_BINARY_MUL] = PREC_MUL, - [EXPR_BINARY_DIV] = PREC_MUL, - [EXPR_BINARY_MOD] = PREC_MUL, - [EXPR_BINARY_EQUAL] = PREC_EQ, - [EXPR_BINARY_NOTEQUAL] = PREC_EQ, - [EXPR_BINARY_LESS] = PREC_CMP, - [EXPR_BINARY_LESSEQUAL] = PREC_CMP, - [EXPR_BINARY_GREATER] = PREC_CMP, - [EXPR_BINARY_GREATEREQUAL] = PREC_CMP, - [EXPR_BINARY_BITWISE_AND] = PREC_BIT_AND, - [EXPR_BINARY_BITWISE_OR] = PREC_BIT_OR, - [EXPR_BINARY_BITWISE_XOR] = PREC_BIT_XOR, - [EXPR_BINARY_LOGICAL_AND] = PREC_LOG_AND, - [EXPR_BINARY_LOGICAL_OR] = PREC_LOG_OR, - [EXPR_BINARY_SHIFTLEFT] = PREC_SHF, - [EXPR_BINARY_SHIFTRIGHT] = PREC_SHF, - [EXPR_BINARY_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_MUL_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_DIV_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_MOD_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_ADD_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_SUB_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_SHIFTLEFT_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_SHIFTRIGHT_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_BITWISE_AND_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_BITWISE_XOR_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_BITWISE_OR_ASSIGN] = PREC_ASSIGN, - [EXPR_BINARY_COMMA] = PREC_COMMA, - - [EXPR_BINARY_BUILTIN_EXPECT] = PREC_PRIM, - [EXPR_BINARY_ISGREATER] = PREC_PRIM, - [EXPR_BINARY_ISGREATEREQUAL] = PREC_PRIM, - [EXPR_BINARY_ISLESS] = PREC_PRIM, - [EXPR_BINARY_ISLESSEQUAL] = PREC_PRIM, - [EXPR_BINARY_ISLESSGREATER] = PREC_PRIM, - [EXPR_BINARY_ISUNORDERED] = PREC_PRIM + [EXPR_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_BUILTIN_EXPECT] = PREC_PRIMARY, + [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]))); unsigned res = prec[kind]; assert(res != PREC_BOTTOM); - return res; + /* we need the lowest bit for right-to-left precedence */ + return 2 * res; } /** @@ -204,7 +196,9 @@ static void print_const(const const_expression_t *cnst) const type_t *const type = skip_typeref(cnst->base.type); - if (is_type_integer(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; @@ -251,7 +245,7 @@ static void print_quoted_string(const string_t *const string, char border, int s if (*c == border) { fputc('\\', out); } - switch(*c) { + switch (*c) { case '\\': fputs("\\\\", out); break; case '\a': fputs("\\a", out); break; case '\b': fputs("\\b", out); break; @@ -268,7 +262,7 @@ static void print_quoted_string(const string_t *const string, char border, int s /*fallthrough*/ default: if(!isprint(*c)) { - fprintf(out, "\\%03o", *c); + fprintf(out, "\\%03o", (unsigned)*c); break; } fputc(*c, out); @@ -368,7 +362,7 @@ static void print_funcname( const funcname_expression_t *funcname) { const char *s = ""; - switch(funcname->kind) { + switch (funcname->kind) { case FUNCNAME_FUNCTION: s = (c_mode & _C99) ? "__func__" : "__FUNCTION__"; break; case FUNCNAME_PRETTY_FUNCTION: s = "__PRETTY_FUNCTION__"; break; case FUNCNAME_FUNCSIG: s = "__FUNCSIG__"; break; @@ -412,7 +406,7 @@ static void print_call_expression(const call_expression_t *call) } else { first = 0; } - print_expression_prec(argument->expression, PREC_COMMA + 1); + print_expression_prec(argument->expression, 2 * PREC_ASSIGNMENT); argument = argument->next; } @@ -486,15 +480,17 @@ static void print_binary_expression(const binary_expression_t *binexpr) static void print_unary_expression(const unary_expression_t *unexpr) { unsigned prec = get_expression_precedence(unexpr->base.kind); - switch(unexpr->base.kind) { - case EXPR_UNARY_NEGATE: fputc('-', out); break; - case EXPR_UNARY_PLUS: fputc('+', out); break; - case EXPR_UNARY_NOT: fputc('!', out); break; - case EXPR_UNARY_BITWISE_NEGATE: fputc('~', out); break; - case EXPR_UNARY_PREFIX_INCREMENT: fputs("++", out); break; - case EXPR_UNARY_PREFIX_DECREMENT: fputs("--", out); break; - case EXPR_UNARY_DEREFERENCE: fputc('*', out); break; - case EXPR_UNARY_TAKE_ADDRESS: fputc('&', out); break; + switch (unexpr->base.kind) { + case EXPR_UNARY_NEGATE: 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_POSTFIX_INCREMENT: print_expression_prec(unexpr->value, prec); @@ -512,9 +508,18 @@ static void print_unary_expression(const unary_expression_t *unexpr) break; case EXPR_UNARY_ASSUME: fputs("__assume(", out); - print_expression_prec(unexpr->value, PREC_COMMA + 1); + print_expression_prec(unexpr->value, 2 * PREC_ASSIGNMENT); fputc(')', out); return; + + case EXPR_UNARY_THROW: + if (unexpr->value == NULL) { + fputs("throw", out); + return; + } + fputs("throw ", out); + break; + default: panic("invalid unary expression found"); } @@ -528,7 +533,7 @@ static void print_unary_expression(const unary_expression_t *unexpr) */ static void print_reference_expression(const reference_expression_t *ref) { - fputs(ref->declaration->symbol->string, out); + fputs(ref->entity->base.symbol->string, out); } /** @@ -538,7 +543,7 @@ static void print_reference_expression(const reference_expression_t *ref) */ static void print_label_address_expression(const label_address_expression_t *le) { - fprintf(out, "&&%s", le->declaration->symbol->string); + fprintf(out, "&&%s", le->label->base.symbol->string); } /** @@ -552,12 +557,12 @@ static void print_array_expression(const array_access_expression_t *expression) if(!expression->flipped) { print_expression_prec(expression->array_ref, prec); fputc('[', out); - print_expression_prec(expression->index, PREC_BOTTOM); + print_expression(expression->index); fputc(']', out); } else { print_expression_prec(expression->index, prec); fputc('[', out); - print_expression_prec(expression->array_ref, PREC_BOTTOM); + print_expression(expression->array_ref); fputc(']', out); } } @@ -578,7 +583,7 @@ static void print_typeprop_expression(const typeprop_expression_t *expression) if(expression->tp_expression != NULL) { /* always print the '()' here, sizeof x is right but unusual */ fputc('(', out); - print_expression_prec(expression->tp_expression, PREC_ACCESS); + print_expression(expression->tp_expression); fputc(')', out); } else { fputc('(', out); @@ -605,7 +610,7 @@ static void print_builtin_symbol(const builtin_symbol_expression_t *expression) static void print_builtin_constant(const builtin_constant_expression_t *expression) { fputs("__builtin_constant_p(", out); - print_expression_prec(expression->value, PREC_COMMA + 1); + print_expression_prec(expression->value, 2 * PREC_ASSIGNMENT); fputc(')', out); } @@ -617,14 +622,14 @@ static void print_builtin_constant(const builtin_constant_expression_t *expressi static void print_builtin_prefetch(const builtin_prefetch_expression_t *expression) { fputs("__builtin_prefetch(", out); - print_expression_prec(expression->adr, PREC_COMMA + 1); + print_expression_prec(expression->adr, 2 * PREC_ASSIGNMENT); if (expression->rw) { fputc(',', out); - print_expression_prec(expression->rw, PREC_COMMA + 1); + print_expression_prec(expression->rw, 2 * PREC_ASSIGNMENT); } if (expression->locality) { fputc(',', out); - print_expression_prec(expression->locality, PREC_COMMA + 1); + print_expression_prec(expression->locality, 2 * PREC_ASSIGNMENT); } fputc(')', out); } @@ -636,15 +641,15 @@ static void print_builtin_prefetch(const builtin_prefetch_expression_t *expressi */ static void print_conditional(const conditional_expression_t *expression) { - print_expression_prec(expression->condition, PREC_LOG_OR); + print_expression_prec(expression->condition, 2 * PREC_LOGICAL_OR); fputs(" ? ", out); if (expression->true_expression != NULL) { - print_expression_prec(expression->true_expression, PREC_EXPR); + print_expression_prec(expression->true_expression, 2 * PREC_EXPRESSION); fputs(" : ", out); } else { fputs(": ", out); } - print_expression_prec(expression->false_expression, PREC_COND); + print_expression_prec(expression->false_expression, 2 * PREC_CONDITIONAL); } /** @@ -655,9 +660,9 @@ static void print_conditional(const conditional_expression_t *expression) static void print_va_start(const va_start_expression_t *const expression) { fputs("__builtin_va_start(", out); - print_expression_prec(expression->ap, PREC_COMMA + 1); + print_expression_prec(expression->ap, 2 * PREC_ASSIGNMENT); fputs(", ", out); - fputs(expression->parameter->symbol->string, out); + fputs(expression->parameter->base.base.symbol->string, out); fputc(')', out); } @@ -669,7 +674,7 @@ static void print_va_start(const va_start_expression_t *const expression) static void print_va_arg(const va_arg_expression_t *expression) { fputs("__builtin_va_arg(", out); - print_expression_prec(expression->ap, PREC_COMMA + 1); + print_expression_prec(expression->ap, 2 * PREC_ASSIGNMENT); fputs(", ", out); print_type(expression->base.type); fputc(')', out); @@ -689,7 +694,7 @@ static void print_select(const select_expression_t *expression) } else { fputc('.', out); } - fputs(expression->compound_entry->symbol->string, out); + fputs(expression->compound_entry->base.symbol->string, out); } /** @@ -701,7 +706,7 @@ static void print_classify_type_expression( const classify_type_expression_t *const expr) { fputs("__builtin_classify_type(", out); - print_expression_prec(expr->type_expression, PREC_COMMA + 1); + print_expression_prec(expr->type_expression, 2 * PREC_ASSIGNMENT); fputc(')', out); } @@ -715,7 +720,7 @@ static void print_designator(const designator_t *designator) for ( ; designator != NULL; designator = designator->next) { if (designator->symbol == NULL) { fputc('[', out); - print_expression_prec(designator->array_index, PREC_BOTTOM); + print_expression(designator->array_index); fputc(']', out); } else { fputc('.', out); @@ -767,7 +772,7 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p top_prec = PREC_TOP; if (top_prec > prec) fputc('(', out); - switch(expression->kind) { + switch (expression->kind) { case EXPR_UNKNOWN: case EXPR_INVALID: fputs("$invalid expression$", out); @@ -800,6 +805,7 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p print_binary_expression(&expression->binary); break; case EXPR_REFERENCE: + case EXPR_REFERENCE_ENUM_VALUE: print_reference_expression(&expression->reference); break; case EXPR_ARRAY_ACCESS: @@ -916,7 +922,7 @@ static void print_goto_statement(const goto_statement_t *statement) fputc('*', out); print_expression(statement->expression); } else { - fputs(statement->label->symbol->string, out); + fputs(statement->label->base.symbol->string, out); } fputs(";\n", out); } @@ -928,7 +934,7 @@ static void print_goto_statement(const goto_statement_t *statement) */ static void print_label_statement(const label_statement_t *statement) { - fprintf(out, "%s:\n", statement->label->symbol->string); + fprintf(out, "%s:\n", statement->label->base.symbol->string); print_indent(); print_statement(statement->statement); } @@ -993,6 +999,47 @@ static void print_case_label(const case_label_statement_t *statement) } } +static void print_local_label(const local_label_statement_t *statement) +{ + fputs("__label__ ", out); + + bool first = true; + entity_t *entity = statement->labels_begin; + for (; + entity != statement->labels_end->base.next; + entity = entity->base.next) { + if (!first) { + fputs(", ", out); + } else { + first = false; + } + fputs(entity->base.symbol->string, out); + } + fputs(";\n", out); +} + +static void print_typedef(const entity_t *entity) +{ + fputs("typedef ", out); + print_type_ext(entity->typedefe.type, entity->base.symbol, NULL); + fputs(";", out); +} + +/** + * returns true if the entity is a compiler generated one and has no real + * correspondenc in the source file + */ +static bool is_generated_entity(const entity_t *entity) +{ + if (entity->kind == ENTITY_TYPEDEF) + return entity->typedefe.builtin; + + if (is_declaration(entity)) + return entity->declaration.implicit; + + return false; +} + /** * Print a declaration statement. * @@ -1002,38 +1049,29 @@ static void print_declaration_statement( const declaration_statement_t *statement) { bool first = true; - declaration_t *declaration = statement->declarations_begin; - - if (declaration->namespc == NAMESPACE_LOCAL_LABEL) { - fputs("__label__ ", out); - for (; - declaration != statement->declarations_end->next; - declaration = declaration->next) { - if (!first) { - fputs(", ", out); - } else { - first = false; - } - fputs(declaration->symbol->string, out); + entity_t *entity = statement->declarations_begin; + for (; + entity != statement->declarations_end->base.next; + entity = entity->base.next) { + if (!is_declaration(entity) && entity->kind != ENTITY_TYPEDEF) + continue; + if (is_generated_entity(entity)) + continue; + + if (!first) { + print_indent(); + } else { + first = false; } - fputs(";\n", out); - } else { - for (; - declaration != statement->declarations_end->next; - declaration = declaration->next) { - if (declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY) - continue; - if (declaration->implicit) - continue; - - if (!first) { - print_indent(); - } else { - first = false; - } - print_declaration(declaration); - fputc('\n', out); + + if (entity->kind == ENTITY_TYPEDEF) { + print_typedef(entity); + } else { + assert(is_declaration(entity)); + print_declaration(entity); } + + fputc('\n', out); } } @@ -1073,13 +1111,15 @@ static void print_do_while_statement(const do_while_statement_t *statement) static void print_for_statement(const for_statement_t *statement) { fputs("for (", out); - declaration_t *decl = statement->scope.declarations; - while (decl != NULL && decl->implicit) - decl = decl->next; - if (decl != NULL) { + entity_t *entity = statement->scope.entities; + while (entity != NULL && is_generated_entity(entity)) + entity = entity->base.next; + + if (entity != NULL) { assert(statement->initialisation == NULL); - print_declaration(decl); - if (decl->next != NULL) { + assert(is_declaration(entity)); + print_declaration(entity); + if (entity->base.next != NULL) { panic("multiple declarations in for statement not supported yet"); } fputc(' ', out); @@ -1227,6 +1267,9 @@ void print_statement(const statement_t *statement) case STATEMENT_LABEL: print_label_statement(&statement->label); break; + case STATEMENT_LOCAL_LABEL: + print_local_label(&statement->local_label); + break; case STATEMENT_GOTO: print_goto_statement(&statement->gotos); break; @@ -1279,8 +1322,7 @@ void print_statement(const statement_t *statement) */ static void print_storage_class(storage_class_tag_t storage_class) { - switch(storage_class) { - case STORAGE_CLASS_ENUM_ENTRY: + switch (storage_class) { case STORAGE_CLASS_NONE: break; case STORAGE_CLASS_TYPEDEF: fputs("typedef ", out); break; @@ -1306,7 +1348,7 @@ void print_initializer(const initializer_t *initializer) return; } - switch(initializer->kind) { + switch (initializer->kind) { case INITIALIZER_VALUE: { const initializer_value_t *value = &initializer->value; print_expression(value->value); @@ -1346,20 +1388,50 @@ void print_initializer(const initializer_t *initializer) /** * Print microsoft extended declaration modifiers. */ -static void print_ms_modifiers(const declaration_t *declaration) { +static void print_ms_modifiers(const declaration_t *declaration) +{ if((c_mode & _MS) == 0) return; decl_modifiers_t modifiers = declaration->modifiers; - /* DM_FORCEINLINE handled outside. */ - if ((modifiers & ~DM_FORCEINLINE) != 0 || - declaration->alignment != 0 || - declaration->get_property_sym != NULL || - declaration->put_property_sym != NULL) { - char *next = "("; + bool ds_shown = false; + const char *next = "("; + + if (declaration->base.kind == ENTITY_VARIABLE) { + variable_t *variable = (variable_t*) declaration; + if (variable->alignment != 0 + || variable->get_property_sym != NULL + || variable->put_property_sym != NULL) { + if (!ds_shown) { + fputs("__declspec", out); + ds_shown = true; + } - fputs("__declspec", out); + if(variable->alignment != 0) { + fputs(next, out); next = ", "; fprintf(out, "align(%u)", variable->alignment); + } + if(variable->get_property_sym != NULL + || variable->put_property_sym != NULL) { + char *comma = ""; + fputs(next, out); next = ", "; fputs("property(", out); + if(variable->get_property_sym != NULL) { + fprintf(out, "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); + } + } + } + + /* DM_FORCEINLINE handled outside. */ + if ((modifiers & ~DM_FORCEINLINE) != 0) { + if (!ds_shown) { + fputs("__declspec", out); + ds_shown = true; + } if(modifiers & DM_DLLIMPORT) { fputs(next, out); next = ", "; fputs("dllimport", out); } @@ -1390,10 +1462,8 @@ static void print_ms_modifiers(const declaration_t *declaration) { if (modifiers & DM_DEPRECATED) { fputs(next, out); next = ", "; fputs("deprecated", out); if(declaration->deprecated_string != NULL) - fprintf(out, "(\"%s\")", declaration->deprecated_string); - } - if(declaration->alignment != 0) { - fputs(next, out); next = ", "; fprintf(out, "align(%u)", declaration->alignment); + fprintf(out, "(\"%s\")", + declaration->deprecated_string); } if(modifiers & DM_RESTRICT) { fputs(next, out); next = ", "; fputs("restrict", out); @@ -1401,51 +1471,80 @@ static void print_ms_modifiers(const declaration_t *declaration) { if(modifiers & DM_NOALIAS) { fputs(next, out); next = ", "; fputs("noalias", out); } - if(declaration->get_property_sym != NULL || declaration->put_property_sym != NULL) { - char *comma = ""; - fputs(next, out); next = ", "; fputs("property(", out); - if(declaration->get_property_sym != NULL) { - fprintf(out, "get=%s", declaration->get_property_sym->string); - comma = ", "; - } - if(declaration->put_property_sym != NULL) - fprintf(out, "%sput=%s", comma, declaration->put_property_sym->string); - fputc(')', out); - } + } + + if (ds_shown) fputs(") ", out); +} + +static void print_scope(const scope_t *scope) +{ + const entity_t *entity = scope->entities; + for ( ; entity != NULL; entity = entity->base.next) { + print_indent(); + print_entity(entity); + fputs("\n", out); } } +static void print_namespace(const namespace_t *namespace) +{ + fputs("namespace ", out); + if (namespace->base.symbol != NULL) { + fputs(namespace->base.symbol->string, out); + fputc(' ', out); + } + + fputs("{\n", out); + ++indent; + + print_scope(&namespace->members); + + --indent; + print_indent(); + fputs("}\n", out); +} + /** - * Print a declaration in the NORMAL namespace. - * - * @param declaration the declaration + * Print a variable or function declaration */ -static void print_normal_declaration(const declaration_t *declaration) +void print_declaration(const entity_t *entity) { + assert(is_declaration(entity)); + const declaration_t *declaration = &entity->declaration; + print_storage_class((storage_class_tag_t) declaration->declared_storage_class); - if (declaration->is_inline) { - if (declaration->modifiers & DM_FORCEINLINE) { - fputs("__forceinline ", out); - } else if (declaration->modifiers & DM_MICROSOFT_INLINE) { - fputs("__inline ", out); - } else { - fputs("inline ", out); + if (entity->kind == ENTITY_FUNCTION) { + function_t *function = (function_t*) declaration; + if (function->is_inline) { + if (declaration->modifiers & DM_FORCEINLINE) { + fputs("__forceinline ", out); + } else if (declaration->modifiers & DM_MICROSOFT_INLINE) { + fputs("__inline ", out); + } else { + fputs("inline ", out); + } } } print_ms_modifiers(declaration); - print_type_ext(declaration->type, declaration->symbol, - &declaration->scope); + if (entity->kind == ENTITY_FUNCTION) { + print_type_ext(entity->declaration.type, entity->base.symbol, + &entity->function.parameters); - if(declaration->type->kind == TYPE_FUNCTION) { - if(declaration->init.statement != NULL) { + if (entity->function.statement != NULL) { fputs("\n", out); - print_statement(declaration->init.statement); + print_indent(); + print_statement(entity->function.statement); return; } - } else if(declaration->init.initializer != NULL) { - fputs(" = ", out); - print_initializer(declaration->init.initializer); + } else { + print_type_ext(declaration->type, declaration->base.symbol, NULL); + + if (entity->kind == ENTITY_VARIABLE + && entity->variable.initializer != NULL) { + fputs(" = ", out); + print_initializer(entity->variable.initializer); + } } fputc(';', out); } @@ -1455,8 +1554,9 @@ static void print_normal_declaration(const declaration_t *declaration) * * @param expression the expression */ -void print_expression(const expression_t *expression) { - print_expression_prec(expression, PREC_BOTTOM); +void print_expression(const expression_t *expression) +{ + print_expression_prec(expression, 2 * PREC_BOTTOM); } /** @@ -1464,44 +1564,58 @@ void print_expression(const expression_t *expression) { * * @param declaration the declaration */ -void print_declaration(const declaration_t *declaration) +void print_entity(const entity_t *entity) { - if (declaration->namespc != NAMESPACE_NORMAL && - declaration->symbol == NULL) + if (entity->base.namespc != NAMESPACE_NORMAL && entity->base.symbol == NULL) return; - switch (declaration->namespc) { - case NAMESPACE_NORMAL: - print_normal_declaration(declaration); - break; - case NAMESPACE_STRUCT: + switch ((entity_kind_tag_t) entity->kind) { + case ENTITY_VARIABLE: + 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(declaration->symbol->string, out); - if (declaration->init.complete) { + fputs(entity->base.symbol->string, out); + if (entity->structe.complete) { fputc(' ', out); - print_compound_definition(declaration); + print_compound_definition(&entity->structe); } fputc(';', out); - break; - case NAMESPACE_UNION: + return; + case ENTITY_UNION: fputs("union ", out); - fputs(declaration->symbol->string, out); - if (declaration->init.complete) { + fputs(entity->base.symbol->string, out); + if (entity->unione.complete) { fputc(' ', out); - print_compound_definition(declaration); + print_compound_definition(&entity->unione); } fputc(';', out); - break; - case NAMESPACE_ENUM: + return; + case ENTITY_ENUM: fputs("enum ", out); - fputs(declaration->symbol->string, out); - if (declaration->init.complete) { - fputc(' ', out); - print_enum_definition(declaration); - } + fputs(entity->base.symbol->string, out); + fputc(' ', out); + print_enum_definition(&entity->enume); fputc(';', out); + return; + case ENTITY_NAMESPACE: + print_namespace(&entity->namespacee); + return; + case ENTITY_LABEL: + case ENTITY_ENUM_VALUE: + case ENTITY_LOCAL_LABEL: + panic("print_entity used on unexpected entity type"); + case ENTITY_INVALID: break; } + panic("Invalid entity type encountered"); } /** @@ -1513,25 +1627,25 @@ void print_ast(const translation_unit_t *unit) { inc_type_visited(); - declaration_t *declaration = unit->scope.declarations; - for( ; declaration != NULL; declaration = declaration->next) { - if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY) + entity_t *entity = unit->scope.entities; + for ( ; entity != NULL; entity = entity->base.next) { + if (entity->kind == ENTITY_ENUM_VALUE) continue; - if(declaration->namespc != NAMESPACE_NORMAL && - declaration->symbol == NULL) + if (entity->base.namespc != NAMESPACE_NORMAL + && entity->base.symbol == NULL) continue; - if (declaration->implicit) + if (is_generated_entity(entity)) continue; print_indent(); - print_declaration(declaration); + print_entity(entity); fputc('\n', out); } } bool is_constant_initializer(const initializer_t *initializer) { - switch(initializer->kind) { + switch (initializer->kind) { case INITIALIZER_STRING: case INITIALIZER_WIDE_STRING: case INITIALIZER_DESIGNATOR: @@ -1553,7 +1667,7 @@ bool is_constant_initializer(const initializer_t *initializer) static bool is_object_with_linker_constant_address(const expression_t *expression) { - switch(expression->kind) { + switch (expression->kind) { case EXPR_UNARY_DEREFERENCE: return is_address_constant(expression->unary.value); @@ -1572,15 +1686,24 @@ static bool is_object_with_linker_constant_address(const expression_t *expressio && is_address_constant(expression->array_access.array_ref); case EXPR_REFERENCE: { - declaration_t *declaration = expression->reference.declaration; - switch((storage_class_tag_t) declaration->storage_class) { - case STORAGE_CLASS_NONE: - case STORAGE_CLASS_EXTERN: - case STORAGE_CLASS_STATIC: - return true; - default: - return false; + entity_t *entity = expression->reference.entity; + if (is_declaration(entity)) { + switch ((storage_class_tag_t) entity->declaration.storage_class) { + case STORAGE_CLASS_NONE: + case STORAGE_CLASS_EXTERN: + case STORAGE_CLASS_STATIC: + return true; + + case STORAGE_CLASS_REGISTER: + case STORAGE_CLASS_TYPEDEF: + case STORAGE_CLASS_AUTO: + case STORAGE_CLASS_THREAD: + case STORAGE_CLASS_THREAD_EXTERN: + case STORAGE_CLASS_THREAD_STATIC: + break; + } } + return false; } default: @@ -1590,7 +1713,7 @@ static bool is_object_with_linker_constant_address(const expression_t *expressio bool is_address_constant(const expression_t *expression) { - switch(expression->kind) { + switch (expression->kind) { case EXPR_UNARY_TAKE_ADDRESS: return is_object_with_linker_constant_address(expression->unary.value); @@ -1633,8 +1756,11 @@ bool is_address_constant(const expression_t *expression) } case EXPR_REFERENCE: { - declaration_t *declaration = expression->reference.declaration; - type_t *type = skip_typeref(declaration->type); + entity_t *entity = expression->reference.entity; + if (!is_declaration(entity)) + return false; + + type_t *type = skip_typeref(entity->declaration.type); if(is_type_function(type)) return true; if(is_type_array(type)) { @@ -1671,9 +1797,12 @@ static bool is_builtin_const_call(const expression_t *expression) 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_nand: + case T___builtin_nanl: return true; } @@ -1695,7 +1824,7 @@ static bool is_constant_pointer(const expression_t *expression) static bool is_object_with_constant_address(const expression_t *expression) { - switch(expression->kind) { + switch (expression->kind) { case EXPR_SELECT: { expression_t *compound = expression->select.compound; type_t *compound_type = compound->base.type; @@ -1739,6 +1868,7 @@ bool is_constant_expression(const expression_t *expression) case EXPR_ALIGNOF: case EXPR_BUILTIN_CONSTANT_P: case EXPR_LABEL_ADDRESS: + case EXPR_REFERENCE_ENUM_VALUE: return true; case EXPR_SIZEOF: { @@ -1758,12 +1888,16 @@ bool is_constant_expression(const expression_t *expression) case EXPR_VA_START: case EXPR_VA_ARG: case EXPR_STATEMENT: + case EXPR_REFERENCE: case EXPR_UNARY_POSTFIX_INCREMENT: case EXPR_UNARY_POSTFIX_DECREMENT: case EXPR_UNARY_PREFIX_INCREMENT: case EXPR_UNARY_PREFIX_DECREMENT: case EXPR_UNARY_ASSUME: /* has VOID type */ case EXPR_UNARY_DEREFERENCE: + case EXPR_UNARY_DELETE: + case EXPR_UNARY_DELETE_ARRAY: + case EXPR_UNARY_THROW: case EXPR_BINARY_ASSIGN: case EXPR_BINARY_MUL_ASSIGN: case EXPR_BINARY_DIV_ASSIGN: @@ -1839,14 +1973,6 @@ bool is_constant_expression(const expression_t *expression) return is_constant_expression(expression->conditional.false_expression); } - case EXPR_REFERENCE: { - declaration_t *declaration = expression->reference.declaration; - if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY) - return true; - - return false; - } - case EXPR_INVALID: return true;