[EXPR_ALIGNOF] = PREC_UNARY,
[EXPR_FUNCNAME] = PREC_PRIMARY,
- [EXPR_BUILTIN_SYMBOL] = PREC_PRIMARY,
[EXPR_BUILTIN_CONSTANT_P] = PREC_PRIMARY,
[EXPR_BUILTIN_TYPES_COMPATIBLE_P] = PREC_PRIMARY,
- [EXPR_BUILTIN_PREFETCH] = PREC_PRIMARY,
[EXPR_OFFSETOF] = PREC_PRIMARY,
[EXPR_VA_START] = PREC_PRIMARY,
[EXPR_VA_ARG] = PREC_PRIMARY,
*/
static void print_call_expression(const call_expression_t *call)
{
- unsigned prec = get_expression_precedence(call->base.kind);
- print_expression_prec(call->function, prec);
+ print_expression_prec(call->function, PREC_POSTFIX);
fputc('(', out);
call_argument_t *argument = call->arguments;
int first = 1;
*/
static void print_array_expression(const array_access_expression_t *expression)
{
- unsigned prec = get_expression_precedence(expression->base.kind);
if (!expression->flipped) {
- print_expression_prec(expression->array_ref, prec);
+ print_expression_prec(expression->array_ref, PREC_POSTFIX);
fputc('[', out);
print_expression(expression->index);
fputc(']', out);
} else {
- print_expression_prec(expression->index, prec);
+ print_expression_prec(expression->index, PREC_POSTFIX);
fputc('[', out);
print_expression(expression->array_ref);
fputc(']', out);
fputs("__alignof__", out);
}
if (expression->tp_expression != NULL) {
- /* always print the '()' here, sizeof x is right but unusual */
- fputc('(', out);
- print_expression(expression->tp_expression);
- fputc(')', out);
+ /* PREC_TOP: always print the '()' here, sizeof x is right but unusual */
+ print_expression_prec(expression->tp_expression, PREC_TOP);
} else {
fputc('(', out);
print_type(expression->type);
}
}
-/**
- * Prints an builtin symbol.
- *
- * @param expression the builtin symbol expression
- */
-static void print_builtin_symbol(const builtin_symbol_expression_t *expression)
-{
- fputs(expression->symbol->string, out);
-}
-
/**
* Prints a builtin constant expression.
*
fputc(')', out);
}
-/**
- * Prints a builtin prefetch expression.
- *
- * @param expression the builtin prefetch expression
- */
-static void print_builtin_prefetch(const builtin_prefetch_expression_t *expression)
-{
- fputs("__builtin_prefetch(", out);
- print_assignment_expression(expression->adr);
- if (expression->rw) {
- fputc(',', out);
- print_assignment_expression(expression->rw);
- }
- if (expression->locality) {
- fputc(',', out);
- print_assignment_expression(expression->locality);
- }
- fputc(')', out);
-}
-
/**
* Prints a conditional expression.
*
static void print_conditional(const conditional_expression_t *expression)
{
print_expression_prec(expression->condition, PREC_LOGICAL_OR);
- fputs(" ? ", out);
if (expression->true_expression != NULL) {
+ fputs(" ? ", out);
print_expression_prec(expression->true_expression, PREC_EXPRESSION);
fputs(" : ", out);
} else {
- fputs(": ", out);
+ fputs(" ?: ", out);
}
precedence_t prec = c_mode & _CXX ? PREC_ASSIGNMENT : PREC_CONDITIONAL;
print_expression_prec(expression->false_expression, prec);
*/
static void print_select(const select_expression_t *expression)
{
- unsigned prec = get_expression_precedence(expression->base.kind);
- print_expression_prec(expression->compound, prec);
+ print_expression_prec(expression->compound, PREC_POSTFIX);
if (is_type_pointer(skip_typeref(expression->compound->base.type))) {
fputs("->", out);
} else {
case EXPR_ALIGNOF:
print_typeprop_expression(&expression->typeprop);
break;
- case EXPR_BUILTIN_SYMBOL:
- print_builtin_symbol(&expression->builtin_symbol);
- break;
case EXPR_BUILTIN_CONSTANT_P:
print_builtin_constant(&expression->builtin_constant);
break;
case EXPR_BUILTIN_TYPES_COMPATIBLE_P:
print_builtin_types_compatible(&expression->builtin_types_compatible);
break;
- case EXPR_BUILTIN_PREFETCH:
- print_builtin_prefetch(&expression->builtin_prefetch);
- break;
case EXPR_CONDITIONAL:
print_conditional(&expression->conditional);
break;
static void print_for_statement(const for_statement_t *statement)
{
fputs("for (", out);
- entity_t *entity = statement->scope.entities;
- while (entity != NULL && is_generated_entity(entity))
- entity = entity->base.next;
-
- if (entity != NULL) {
- assert(statement->initialisation == NULL);
- assert(is_declaration(entity));
- print_declaration(entity);
- if (entity->base.next != NULL) {
- panic("multiple declarations in for statement not supported yet");
- }
+ if (statement->initialisation != NULL) {
+ print_expression(statement->initialisation);
+ fputc(';', out);
} else {
- if (statement->initialisation) {
- print_expression(statement->initialisation);
+ entity_t const *entity = statement->scope.entities;
+ for (; entity != NULL; entity = entity->base.next) {
+ if (is_generated_entity(entity))
+ continue;
+ /* FIXME display of multiple declarations is wrong */
+ print_declaration(entity);
}
- fputc(';', out);
}
if (statement->condition != NULL) {
fputc(' ', out);
}
}
+/**
+ * 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)
{
expression_t *function = expression->call.function;
- if (function->kind != EXPR_BUILTIN_SYMBOL) {
+ if (function->kind != EXPR_REFERENCE)
+ return false;
+ reference_expression_t *ref = &function->reference;
+ if (ref->entity->kind != ENTITY_FUNCTION)
return false;
- }
-
- symbol_t *symbol = function->builtin_symbol.symbol;
- switch (symbol->ID) {
- case T___builtin_huge_val:
- case T___builtin_inf:
- case T___builtin_inff:
- case T___builtin_infl:
- case T___builtin_nan:
- case T___builtin_nanf:
- case T___builtin_nanl:
+ 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;
+ default:
+ return false;
}
- return false;
}
static bool is_constant_pointer(const expression_t *expression)
return true;
}
- case EXPR_BUILTIN_SYMBOL:
- case EXPR_BUILTIN_PREFETCH:
case EXPR_SELECT:
case EXPR_VA_START:
case EXPR_VA_ARG:
projects / cparser / blobdiff