[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,
print_initializer(expression->initializer);
}
+static void print_assignment_expression(const expression_t *const expr)
+{
+ print_expression_prec(expr, PREC_ASSIGNMENT);
+}
+
/**
* Prints a call expression.
*
} else {
first = 0;
}
- print_expression_prec(argument->expression, PREC_ASSIGNMENT);
+ print_assignment_expression(argument->expression);
argument = argument->next;
}
unsigned prec = get_expression_precedence(binexpr->base.kind);
int r2l = right_to_left(prec);
- if (binexpr->base.kind == EXPR_BINARY_BUILTIN_EXPECT) {
- fputs("__builtin_expect(", out);
- print_expression_prec(binexpr->left, prec);
- fputs(", ", out);
- print_expression_prec(binexpr->right, prec);
- fputc(')', out);
- return;
- }
-
print_expression_prec(binexpr->left, prec + r2l);
char const* op;
switch (binexpr->base.kind) {
break;
case EXPR_UNARY_ASSUME:
fputs("__assume(", out);
- print_expression_prec(unexpr->value, PREC_ASSIGNMENT);
+ print_assignment_expression(unexpr->value);
fputc(')', out);
return;
static void print_builtin_constant(const builtin_constant_expression_t *expression)
{
fputs("__builtin_constant_p(", out);
- print_expression_prec(expression->value, PREC_ASSIGNMENT);
+ print_assignment_expression(expression->value);
fputc(')', out);
}
static void print_builtin_prefetch(const builtin_prefetch_expression_t *expression)
{
fputs("__builtin_prefetch(", out);
- print_expression_prec(expression->adr, PREC_ASSIGNMENT);
+ print_assignment_expression(expression->adr);
if (expression->rw) {
fputc(',', out);
- print_expression_prec(expression->rw, PREC_ASSIGNMENT);
+ print_assignment_expression(expression->rw);
}
if (expression->locality) {
fputc(',', out);
- print_expression_prec(expression->locality, PREC_ASSIGNMENT);
+ print_assignment_expression(expression->locality);
}
fputc(')', out);
}
static void print_va_start(const va_start_expression_t *const expression)
{
fputs("__builtin_va_start(", out);
- print_expression_prec(expression->ap, PREC_ASSIGNMENT);
+ print_assignment_expression(expression->ap);
fputs(", ", out);
fputs(expression->parameter->base.base.symbol->string, out);
fputc(')', out);
static void print_va_arg(const va_arg_expression_t *expression)
{
fputs("__builtin_va_arg(", out);
- print_expression_prec(expression->ap, PREC_ASSIGNMENT);
+ print_assignment_expression(expression->ap);
fputs(", ", out);
print_type(expression->base.type);
fputc(')', out);
const classify_type_expression_t *const expr)
{
fputs("__builtin_classify_type(", out);
- print_expression_prec(expr->type_expression, PREC_ASSIGNMENT);
+ print_assignment_expression(expr->type_expression);
fputc(')', out);
}
if (expression->kind == EXPR_UNARY_CAST_IMPLICIT && !print_implicit_casts) {
expression = expression->unary.value;
}
- unsigned prec = get_expression_precedence(expression->base.kind);
- if (print_parenthesis && top_prec != PREC_BOTTOM)
- top_prec = PREC_TOP;
- if (top_prec > prec)
+
+ bool parenthesized =
+ expression->base.parenthesized ||
+ (print_parenthesis && top_prec != PREC_BOTTOM) ||
+ top_prec > get_expression_precedence(expression->base.kind);
+
+ if (parenthesized)
fputc('(', out);
switch (expression->kind) {
case EXPR_UNKNOWN:
fprintf(out, "some expression of type %d", (int)expression->kind);
break;
}
- if (top_prec > prec)
+ if (parenthesized)
fputc(')', out);
}
*/
static void print_return_statement(const return_statement_t *statement)
{
- fputs("return ", out);
- if (statement->value != NULL)
- print_expression(statement->value);
- fputs(";\n", out);
+ expression_t const *const val = statement->value;
+ if (val != NULL) {
+ fputs("return ", out);
+ print_expression(val);
+ fputs(";\n", out);
+ } else {
+ fputs("return;\n", out);
+ }
}
/**
{
fputs("typedef ", out);
print_type_ext(entity->typedefe.type, entity->base.symbol, NULL);
- fputs(";", out);
+ fputc(';', out);
}
/**
{
bool first = true;
entity_t *entity = statement->declarations_begin;
- for (;
- entity != statement->declarations_end->base.next;
- entity = entity->base.next) {
+ if (entity == NULL) {
+ fputs("/* empty declaration statement */\n", out);
+ return;
+ }
+
+ entity_t *const end = statement->declarations_end->base.next;
+ for (; entity != end; entity = entity->base.next) {
if (!is_declaration(entity) && entity->kind != ENTITY_TYPEDEF)
continue;
if (is_generated_entity(entity))
switch (initializer->kind) {
case INITIALIZER_VALUE: {
const initializer_value_t *value = &initializer->value;
- print_expression(value->value);
+ print_assignment_expression(value->value);
return;
}
case INITIALIZER_LIST: {
switch ((entity_kind_tag_t)entity->kind) {
case ENTITY_VARIABLE:
+ case ENTITY_PARAMETER:
case ENTITY_COMPOUND_MEMBER:
print_declaration(entity);
return;
case EXPR_BINARY_LOGICAL_OR:
case EXPR_BINARY_SHIFTLEFT:
case EXPR_BINARY_SHIFTRIGHT:
- case EXPR_BINARY_BUILTIN_EXPECT:
case EXPR_BINARY_ISGREATER:
case EXPR_BINARY_ISGREATEREQUAL:
case EXPR_BINARY_ISLESS: