X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast.c;h=6b0542e06c711c5d122c15219c3b2d068bd92ba2;hb=3eb0427e93cb3a74d1ea1d8cde953c03a026c0a6;hp=f20956ec612e03b22dbf827d658520f44a9e7ce0;hpb=4ff6a740822319a9d99752167659ee334b48dfc5;p=cparser diff --git a/ast.c b/ast.c index f20956e..6b0542e 100644 --- a/ast.c +++ b/ast.c @@ -30,6 +30,12 @@ #include #include +#ifdef __INTEL_COMPILER +#include +#else +#include +#endif + #include "adt/error.h" struct obstack ast_obstack; @@ -54,40 +60,41 @@ void change_indent(int delta) void print_indent(void) { - for(int i = 0; i < indent; ++i) - fprintf(out, "\t"); + for (int i = 0; i < indent; ++i) + fputc('\t', out); } enum precedence_t { PREC_BOTTOM = 0, - PREC_COMMA = 2, /* , left to right */ - PREC_ASSIGN = 4, /* = += -= *= /= %= <<= >>= &= ^= |= right to left */ - PREC_COND = 6, /* ?: right to left */ - PREC_LOG_OR = 8, /* || left to right */ - PREC_LOG_AND = 10, /* && left to right */ - PREC_BIT_OR = 12, /* | left to right */ - PREC_BIT_XOR = 14, /* ^ left to right */ - PREC_BIT_AND = 16, /* & left to right */ - PREC_EQ = 18, /* == != left to right */ - PREC_CMP = 20, /* < <= > >= left to right */ - PREC_SHF = 22, /* << >> left to right */ - PREC_PLUS = 24, /* + - left to right */ - PREC_MUL = 26, /* * / % left to right */ - PREC_UNARY = 28, /* ! ~ ++ -- + - (type) * & sizeof right to left */ - PREC_ACCESS = 30, /* () [] -> . left to right */ - PREC_PRIM = 32, /* primary */ - PREC_TOP = 34 + 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; + precedence == PREC_UNARY) ? 1 : 0; } /** @@ -107,7 +114,7 @@ static unsigned get_expression_precedence(expression_kind_t kind) [EXPR_STRING_LITERAL] = PREC_PRIM, [EXPR_WIDE_STRING_LITERAL] = PREC_PRIM, [EXPR_COMPOUND_LITERAL] = PREC_UNARY, - [EXPR_CALL] = PREC_PRIM, + [EXPR_CALL] = PREC_ACCESS, [EXPR_CONDITIONAL] = PREC_COND, [EXPR_SELECT] = PREC_ACCESS, [EXPR_ARRAY_ACCESS] = PREC_ACCESS, @@ -123,6 +130,7 @@ static unsigned get_expression_precedence(expression_kind_t kind) [EXPR_VA_START] = PREC_PRIM, [EXPR_VA_ARG] = PREC_PRIM, [EXPR_STATEMENT] = PREC_ACCESS, + [EXPR_LABEL_ADDRESS] = PREC_PRIM, [EXPR_UNARY_NEGATE] = PREC_UNARY, [EXPR_UNARY_PLUS] = PREC_UNARY, @@ -199,10 +207,33 @@ static void print_const(const const_expression_t *cnst) if (is_type_integer(type)) { fprintf(out, "%lld", cnst->v.int_value); } else if (is_type_float(type)) { - fprintf(out, "%Lf", cnst->v.float_value); + long double const val = cnst->v.float_value; +#ifdef _WIN32 + /* ARG, no way to print long double */ + fprintf(out, "%.20g", (double)val); +#else + fprintf(out, "%.20Lg", val); +#endif + if (isfinite(val) && truncl(val) == val) + fputs(".0", out); } else { panic("unknown constant"); } + + char const* suffix; + switch (type->atomic.akind) { + case ATOMIC_TYPE_UINT: suffix = "U"; break; + case ATOMIC_TYPE_LONG: suffix = "L"; break; + case ATOMIC_TYPE_ULONG: suffix = "UL"; break; + case ATOMIC_TYPE_LONGLONG: suffix = "LL"; break; + case ATOMIC_TYPE_ULONGLONG: suffix = "ULL"; break; + case ATOMIC_TYPE_FLOAT: suffix = "F"; break; + case ATOMIC_TYPE_LONG_DOUBLE: suffix = "L"; break; + + default: suffix = NULL; break; + } + if (suffix != NULL) + fputs(suffix, out); } /** @@ -359,7 +390,7 @@ static void print_compound_literal( { fputc('(', out); print_type(expression->type); - fputs(") ", out); + fputc(')', out); print_initializer(expression->initializer); } @@ -372,12 +403,12 @@ static void print_call_expression(const call_expression_t *call) { unsigned prec = get_expression_precedence(call->base.kind); print_expression_prec(call->function, prec); - fprintf(out, "("); + fputc('(', out); call_argument_t *argument = call->arguments; int first = 1; while(argument != NULL) { if(!first) { - fprintf(out, ", "); + fputs(", ", out); } else { first = 0; } @@ -385,7 +416,7 @@ static void print_call_expression(const call_expression_t *call) argument = argument->next; } - fprintf(out, ")"); + fputc(')', out); } /** @@ -408,44 +439,42 @@ static void print_binary_expression(const binary_expression_t *binexpr) } print_expression_prec(binexpr->left, prec + r2l); - if (binexpr->base.kind != EXPR_BINARY_COMMA) { - fputc(' ', out); - } + char const* op; switch (binexpr->base.kind) { - case EXPR_BINARY_COMMA: fputs(",", out); break; - case EXPR_BINARY_ASSIGN: fputs("=", out); break; - case EXPR_BINARY_ADD: fputs("+", out); break; - case EXPR_BINARY_SUB: fputs("-", out); break; - case EXPR_BINARY_MUL: fputs("*", out); break; - case EXPR_BINARY_MOD: fputs("%", out); break; - case EXPR_BINARY_DIV: fputs("/", out); break; - case EXPR_BINARY_BITWISE_OR: fputs("|", out); break; - case EXPR_BINARY_BITWISE_AND: fputs("&", out); break; - case EXPR_BINARY_BITWISE_XOR: fputs("^", out); break; - case EXPR_BINARY_LOGICAL_OR: fputs("||", out); break; - case EXPR_BINARY_LOGICAL_AND: fputs("&&", out); break; - case EXPR_BINARY_NOTEQUAL: fputs("!=", out); break; - case EXPR_BINARY_EQUAL: fputs("==", out); break; - case EXPR_BINARY_LESS: fputs("<", out); break; - case EXPR_BINARY_LESSEQUAL: fputs("<=", out); break; - case EXPR_BINARY_GREATER: fputs(">", out); break; - case EXPR_BINARY_GREATEREQUAL: fputs(">=", out); break; - case EXPR_BINARY_SHIFTLEFT: fputs("<<", out); break; - case EXPR_BINARY_SHIFTRIGHT: fputs(">>", out); break; - - case EXPR_BINARY_ADD_ASSIGN: fputs("+=", out); break; - case EXPR_BINARY_SUB_ASSIGN: fputs("-=", out); break; - case EXPR_BINARY_MUL_ASSIGN: fputs("*=", out); break; - case EXPR_BINARY_MOD_ASSIGN: fputs("%=", out); break; - case EXPR_BINARY_DIV_ASSIGN: fputs("/=", out); break; - case EXPR_BINARY_BITWISE_OR_ASSIGN: fputs("|=", out); break; - case EXPR_BINARY_BITWISE_AND_ASSIGN: fputs("&=", out); break; - case EXPR_BINARY_BITWISE_XOR_ASSIGN: fputs("^=", out); break; - case EXPR_BINARY_SHIFTLEFT_ASSIGN: fputs("<<=", out); break; - case EXPR_BINARY_SHIFTRIGHT_ASSIGN: fputs(">>=", out); break; + case EXPR_BINARY_COMMA: op = ", "; break; + case EXPR_BINARY_ASSIGN: op = " = "; break; + case EXPR_BINARY_ADD: op = " + "; break; + case EXPR_BINARY_SUB: op = " - "; break; + case EXPR_BINARY_MUL: op = " * "; break; + case EXPR_BINARY_MOD: op = " % "; break; + case EXPR_BINARY_DIV: op = " / "; break; + case EXPR_BINARY_BITWISE_OR: op = " | "; break; + case EXPR_BINARY_BITWISE_AND: op = " & "; break; + case EXPR_BINARY_BITWISE_XOR: op = " ^ "; break; + case EXPR_BINARY_LOGICAL_OR: op = " || "; break; + case EXPR_BINARY_LOGICAL_AND: op = " && "; break; + case EXPR_BINARY_NOTEQUAL: op = " != "; break; + case EXPR_BINARY_EQUAL: op = " == "; break; + case EXPR_BINARY_LESS: op = " < "; break; + case EXPR_BINARY_LESSEQUAL: op = " <= "; break; + case EXPR_BINARY_GREATER: op = " > "; break; + case EXPR_BINARY_GREATEREQUAL: op = " >= "; break; + case EXPR_BINARY_SHIFTLEFT: op = " << "; break; + case EXPR_BINARY_SHIFTRIGHT: op = " >> "; break; + + case EXPR_BINARY_ADD_ASSIGN: op = " += "; break; + case EXPR_BINARY_SUB_ASSIGN: op = " -= "; break; + case EXPR_BINARY_MUL_ASSIGN: op = " *= "; break; + case EXPR_BINARY_MOD_ASSIGN: op = " %= "; break; + case EXPR_BINARY_DIV_ASSIGN: op = " /= "; break; + case EXPR_BINARY_BITWISE_OR_ASSIGN: op = " |= "; break; + case EXPR_BINARY_BITWISE_AND_ASSIGN: op = " &= "; break; + case EXPR_BINARY_BITWISE_XOR_ASSIGN: op = " ^= "; break; + case EXPR_BINARY_SHIFTLEFT_ASSIGN: op = " <<= "; break; + case EXPR_BINARY_SHIFTRIGHT_ASSIGN: op = " >>= "; break; default: panic("invalid binexpression found"); } - fputc(' ', out); + fputs(op, out); print_expression_prec(binexpr->right, prec - r2l); } @@ -458,14 +487,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: fputs("-", out); break; - case EXPR_UNARY_PLUS: fputs("+", out); break; - case EXPR_UNARY_NOT: fputs("!", out); break; - case EXPR_UNARY_BITWISE_NEGATE: fputs("~", out); break; + 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: fputs("*", out); break; - case EXPR_UNARY_TAKE_ADDRESS: fputs("&", out); break; + case EXPR_UNARY_DEREFERENCE: fputc('*', out); break; + case EXPR_UNARY_TAKE_ADDRESS: fputc('&', out); break; case EXPR_UNARY_POSTFIX_INCREMENT: print_expression_prec(unexpr->value, prec); @@ -499,7 +528,17 @@ static void print_unary_expression(const unary_expression_t *unexpr) */ static void print_reference_expression(const reference_expression_t *ref) { - fprintf(out, "%s", ref->declaration->symbol->string); + fputs(ref->declaration->symbol->string, out); +} + +/** + * Prints a label address expression. + * + * @param ref the reference expression + */ +static void print_label_address_expression(const label_address_expression_t *le) +{ + fprintf(out, "&&%s", le->declaration->symbol->string); } /** @@ -597,18 +636,15 @@ static void print_builtin_prefetch(const builtin_prefetch_expression_t *expressi */ static void print_conditional(const conditional_expression_t *expression) { - unsigned prec = get_expression_precedence(expression->base.kind); - fputs("(", out); - print_expression_prec(expression->condition, prec); + print_expression_prec(expression->condition, PREC_LOG_OR); fputs(" ? ", out); if (expression->true_expression != NULL) { - print_expression_prec(expression->true_expression, prec); + print_expression_prec(expression->true_expression, PREC_EXPR); fputs(" : ", out); } else { fputs(": ", out); } - print_expression_prec(expression->false_expression, prec); - fputs(")", out); + print_expression_prec(expression->false_expression, PREC_COND); } /** @@ -622,7 +658,7 @@ static void print_va_start(const va_start_expression_t *const expression) print_expression_prec(expression->ap, PREC_COMMA + 1); fputs(", ", out); fputs(expression->parameter->symbol->string, out); - fputs(")", out); + fputc(')', out); } /** @@ -636,7 +672,7 @@ static void print_va_arg(const va_arg_expression_t *expression) print_expression_prec(expression->ap, PREC_COMMA + 1); fputs(", ", out); print_type(expression->base.type); - fputs(")", out); + fputc(')', out); } /** @@ -653,7 +689,7 @@ static void print_select(const select_expression_t *expression) } else { fputc('.', out); } - fputs(expression->symbol->string, out); + fputs(expression->compound_entry->symbol->string, out); } /** @@ -734,7 +770,7 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p switch(expression->kind) { case EXPR_UNKNOWN: case EXPR_INVALID: - fprintf(out, "$invalid expression$"); + fputs("$invalid expression$", out); break; case EXPR_CHARACTER_CONSTANT: print_character_constant(&expression->conste); @@ -769,6 +805,9 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p 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; @@ -827,10 +866,11 @@ static void print_compound_statement(const compound_statement_t *block) ++indent; statement_t *statement = block->statements; - while(statement != NULL) { + while (statement != NULL) { if (statement->base.kind == STATEMENT_CASE_LABEL) --indent; - print_indent(); + if (statement->kind != STATEMENT_LABEL) + print_indent(); print_statement(statement); statement = statement->base.next; @@ -847,7 +887,7 @@ static void print_compound_statement(const compound_statement_t *block) */ static void print_return_statement(const return_statement_t *statement) { - fprintf(out, "return "); + fputs("return ", out); if(statement->value != NULL) print_expression(statement->value); fputs(";\n", out); @@ -871,9 +911,13 @@ static void print_expression_statement(const expression_statement_t *statement) */ static void print_goto_statement(const goto_statement_t *statement) { - fprintf(out, "goto "); - fputs(statement->label->symbol->string, out); - fprintf(stderr, "(%p)", (void*) statement->label); + fputs("goto ", out); + if (statement->expression != NULL) { + fputc('*', out); + print_expression(statement->expression); + } else { + fputs(statement->label->symbol->string, out); + } fputs(";\n", out); } @@ -884,8 +928,8 @@ static void print_goto_statement(const goto_statement_t *statement) */ static void print_label_statement(const label_statement_t *statement) { - fprintf(stderr, "(%p)", (void*) statement->label); fprintf(out, "%s:\n", statement->label->symbol->string); + print_indent(); print_statement(statement->statement); } @@ -958,21 +1002,38 @@ static void print_declaration_statement( const declaration_statement_t *statement) { bool first = true; - for (declaration_t *declaration = statement->declarations_begin; - 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; + declaration_t *declaration = statement->declarations_begin; + + if (declaration->namespc == NAMESPACE_LOCAL_LABEL) { + fputs("__label__ ", out); + for (; + declaration != statement->declarations_end->next; + declaration = declaration->next) { + if (!first) { + fputs(", ", out); + } else { + first = false; + } + fputs(declaration->symbol->string, out); + } + fputs(";\n", out); + } else { + for (; + declaration != statement->declarations_end->next; + declaration = declaration->next) { + if (declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY) + continue; + if (declaration->implicit) + continue; + + if (!first) { + print_indent(); + } else { + first = false; + } + print_declaration(declaration); + fputc('\n', out); } - print_declaration(declaration); - fputc('\n', out); } } @@ -1057,7 +1118,7 @@ static void print_asm_arguments(asm_argument_t *arguments) print_quoted_string(&argument->constraints, '"', 1); fputs(" (", out); print_expression(argument->expression); - fputs(")", out); + fputc(')', out); } } @@ -1088,20 +1149,21 @@ static void print_asm_statement(const asm_statement_t *statement) if(statement->is_volatile) { fputs("volatile ", out); } - fputs("(", out); + fputc('(', out); print_quoted_string(&statement->asm_text, '"', 1); - if(statement->inputs == NULL && statement->outputs == NULL - && statement->clobbers == NULL) + if (statement->outputs == NULL && + statement->inputs == NULL && + statement->clobbers == NULL) goto end_of_print_asm_statement; fputs(" : ", out); - print_asm_arguments(statement->inputs); - if(statement->outputs == NULL && statement->clobbers == NULL) + print_asm_arguments(statement->outputs); + if (statement->inputs == NULL && statement->clobbers == NULL) goto end_of_print_asm_statement; fputs(" : ", out); - print_asm_arguments(statement->outputs); - if(statement->clobbers == NULL) + print_asm_arguments(statement->inputs); + if (statement->clobbers == NULL) goto end_of_print_asm_statement; fputs(" : ", out); @@ -1149,7 +1211,7 @@ static void print_leave_statement(const leave_statement_t *statement) */ void print_statement(const statement_t *statement) { - switch(statement->kind) { + switch (statement->kind) { case STATEMENT_EMPTY: fputs(";\n", out); break; @@ -1205,7 +1267,7 @@ void print_statement(const statement_t *statement) print_leave_statement(&statement->leave); break; case STATEMENT_INVALID: - fprintf(out, "$invalid statement$"); + fputs("$invalid statement$\n", out); break; } } @@ -1339,15 +1401,15 @@ 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 = ", "; fprintf(out, "property("); - if(declaration->get_property_sym != NULL) { - fprintf(out, "get=%s", declaration->get_property_sym->string); - comma = ", "; + 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); + if(declaration->put_property_sym != NULL) + fprintf(out, "%sput=%s", comma, declaration->put_property_sym->string); fputc(')', out); } fputs(") ", out); @@ -1378,6 +1440,7 @@ static void print_normal_declaration(const declaration_t *declaration) if(declaration->type->kind == TYPE_FUNCTION) { if(declaration->init.statement != NULL) { fputs("\n", out); + print_indent(); print_statement(declaration->init.statement); return; } @@ -1404,33 +1467,39 @@ void print_expression(const expression_t *expression) { */ void print_declaration(const declaration_t *declaration) { - if(declaration->namespc != NAMESPACE_NORMAL && - declaration->symbol == NULL) + if (declaration->namespc != NAMESPACE_NORMAL && + declaration->symbol == NULL) return; - switch(declaration->namespc) { + switch (declaration->namespc) { case NAMESPACE_NORMAL: print_normal_declaration(declaration); break; case NAMESPACE_STRUCT: fputs("struct ", out); fputs(declaration->symbol->string, out); - fputc(' ', out); - print_compound_definition(declaration); + if (declaration->init.complete) { + fputc(' ', out); + print_compound_definition(declaration); + } fputc(';', out); break; case NAMESPACE_UNION: fputs("union ", out); fputs(declaration->symbol->string, out); - fputc(' ', out); - print_compound_definition(declaration); + if (declaration->init.complete) { + fputc(' ', out); + print_compound_definition(declaration); + } fputc(';', out); break; case NAMESPACE_ENUM: fputs("enum ", out); fputs(declaration->symbol->string, out); - fputc(' ', out); - print_enum_definition(declaration); + if (declaration->init.complete) { + fputc(' ', out); + print_enum_definition(declaration); + } fputc(';', out); break; } @@ -1539,10 +1608,11 @@ 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())))) + if (!is_type_pointer(dest) && ( + dest->kind != TYPE_ATOMIC || + !(get_atomic_type_flags(dest->atomic.akind) & ATOMIC_TYPE_FLAG_INTEGER) || + (get_atomic_type_size(dest->atomic.akind) < get_atomic_type_size(get_intptr_kind()) + ))) return false; return (is_constant_expression(expression->unary.value) @@ -1571,9 +1641,21 @@ bool is_address_constant(const expression_t *expression) 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; } + 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); + } + default: return false; } @@ -1590,9 +1672,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; } @@ -1605,8 +1690,6 @@ static bool is_constant_pointer(const expression_t *expression) return true; switch (expression->kind) { - case EXPR_SELECT: - return is_constant_pointer(expression->select.compound); case EXPR_UNARY_CAST: return is_constant_pointer(expression->unary.value); default: @@ -1627,9 +1710,17 @@ static bool is_object_with_constant_address(const expression_t *expression) return is_object_with_constant_address(compound); } } - case EXPR_ARRAY_ACCESS: - return is_constant_pointer(expression->array_access.array_ref) - && is_constant_expression(expression->array_access.index); + + case EXPR_ARRAY_ACCESS: { + array_access_expression_t const* const array_access = + &expression->array_access; + return + is_constant_expression(array_access->index) && ( + is_object_with_constant_address(array_access->array_ref) || + is_constant_pointer(array_access->array_ref) + ); + } + case EXPR_UNARY_DEREFERENCE: return is_constant_pointer(expression->unary.value); default: @@ -1639,7 +1730,7 @@ static bool is_object_with_constant_address(const expression_t *expression) bool is_constant_expression(const expression_t *expression) { - switch(expression->kind) { + switch (expression->kind) { case EXPR_CONST: case EXPR_CHARACTER_CONSTANT: @@ -1651,6 +1742,7 @@ bool is_constant_expression(const expression_t *expression) case EXPR_OFFSETOF: case EXPR_ALIGNOF: case EXPR_BUILTIN_CONSTANT_P: + case EXPR_LABEL_ADDRESS: return true; case EXPR_SIZEOF: { @@ -1688,6 +1780,7 @@ bool is_constant_expression(const expression_t *expression) case EXPR_BINARY_BITWISE_XOR_ASSIGN: case EXPR_BINARY_BITWISE_OR_ASSIGN: case EXPR_BINARY_COMMA: + case EXPR_ARRAY_ACCESS: return false; case EXPR_UNARY_TAKE_ADDRESS: @@ -1750,10 +1843,6 @@ bool is_constant_expression(const expression_t *expression) return is_constant_expression(expression->conditional.false_expression); } - case EXPR_ARRAY_ACCESS: - return is_constant_expression(expression->array_access.array_ref) - && is_constant_expression(expression->array_access.index); - case EXPR_REFERENCE: { declaration_t *declaration = expression->reference.declaration; if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY)