[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,
*/
static void print_const(const const_expression_t *cnst)
{
- if(cnst->base.type == NULL)
+ if (cnst->base.type == NULL)
return;
const type_t *const type = skip_typeref(cnst->base.type);
if (c_mode & _GNUC) {
fputs("\\e", out); break;
}
- /*fallthrough*/
+ /* FALLTHROUGH */
default:
- if(!isprint(*c)) {
+ if (!isprint(*c)) {
fprintf(out, "\\%03o", (unsigned)*c);
break;
}
if (c_mode & _GNUC) {
fputs("\\e", out); break;
}
- /*fallthrough*/
+ /* FALLTHROUGH */
default: {
const unsigned tc = *c;
if (tc < 0x80U) {
- if (!isprint(*c)) {
+ if (!isprint(*c)) {
fprintf(out, "\\%03o", (char)*c);
} else {
fputc(*c, out);
/**
* Prints a predefined symbol.
*/
-static void print_funcname(
- const funcname_expression_t *funcname)
+static void print_funcname(const funcname_expression_t *funcname)
{
const char *s = "";
switch (funcname->kind) {
case FUNCNAME_FUNCSIG: s = "__FUNCSIG__"; break;
case FUNCNAME_FUNCDNAME: s = "__FUNCDNAME__"; break;
}
- fputc('"', out);
fputs(s, out);
- fputc('"', out);
}
static void print_wide_string_literal(
print_initializer(expression->initializer);
}
+static void print_assignment_expression(const expression_t *const expr)
+{
+ print_expression_prec(expr, PREC_ASSIGNMENT);
+}
+
/**
* Prints a call expression.
*
fputc('(', out);
call_argument_t *argument = call->arguments;
int first = 1;
- while(argument != NULL) {
- if(!first) {
+ while (argument != NULL) {
+ if (!first) {
fputs(", ", out);
} 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_array_expression(const array_access_expression_t *expression)
{
unsigned prec = get_expression_precedence(expression->base.kind);
- if(!expression->flipped) {
+ if (!expression->flipped) {
print_expression_prec(expression->array_ref, prec);
fputc('[', out);
print_expression(expression->index);
assert(expression->base.kind == EXPR_ALIGNOF);
fputs("__alignof__", out);
}
- if(expression->tp_expression != NULL) {
+ if (expression->tp_expression != NULL) {
/* always print the '()' here, sizeof x is right but unusual */
fputc('(', out);
print_expression(expression->tp_expression);
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);
{
unsigned prec = get_expression_precedence(expression->base.kind);
print_expression_prec(expression->compound, prec);
- if(is_type_pointer(skip_typeref(expression->compound->base.type))) {
+ if (is_type_pointer(skip_typeref(expression->compound->base.type))) {
fputs("->", out);
} else {
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:
default:
/* TODO */
- fprintf(out, "some expression of type %d", (int) expression->kind);
+ 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(") ", out);
print_statement(statement->true_statement);
- if(statement->false_statement != NULL) {
+ if (statement->false_statement != NULL) {
print_indent();
fputs("else ", out);
print_statement(statement->false_statement);
*/
static void print_case_label(const case_label_statement_t *statement)
{
- if(statement->expression == NULL) {
+ if (statement->expression == NULL) {
fputs("default:\n", out);
} else {
fputs("case ", out);
fputs(":\n", out);
}
++indent;
- if(statement->statement != NULL) {
+ if (statement->statement != NULL) {
if (statement->statement->base.kind == STATEMENT_CASE_LABEL) {
--indent;
}
{
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))
}
fputc(' ', out);
} else {
- if(statement->initialisation) {
+ if (statement->initialisation) {
print_expression(statement->initialisation);
}
fputs("; ", out);
}
- if(statement->condition != NULL) {
+ if (statement->condition != NULL) {
print_expression(statement->condition);
}
fputs("; ", out);
- if(statement->step != NULL) {
+ if (statement->step != NULL) {
print_expression(statement->step);
}
fputs(") ", out);
static void print_asm_arguments(asm_argument_t *arguments)
{
asm_argument_t *argument = arguments;
- for( ; argument != NULL; argument = argument->next) {
- if(argument != arguments)
+ for (; argument != NULL; argument = argument->next) {
+ if (argument != arguments)
fputs(", ", out);
- if(argument->symbol) {
+ if (argument->symbol) {
fprintf(out, "[%s] ", argument->symbol->string);
}
print_quoted_string(&argument->constraints, '"', 1);
static void print_asm_clobbers(asm_clobber_t *clobbers)
{
asm_clobber_t *clobber = clobbers;
- for( ; clobber != NULL; clobber = clobber->next) {
- if(clobber != clobbers)
+ for (; clobber != NULL; clobber = clobber->next) {
+ if (clobber != clobbers)
fputs(", ", out);
print_quoted_string(&clobber->clobber, '"', 1);
static void print_asm_statement(const asm_statement_t *statement)
{
fputs("asm ", out);
- if(statement->is_volatile) {
+ if (statement->is_volatile) {
fputs("volatile ", out);
}
fputc('(', out);
fputs("__try ", out);
print_statement(statement->try_statement);
print_indent();
- if(statement->except_expression != NULL) {
+ if (statement->except_expression != NULL) {
fputs("__except(", out);
print_expression(statement->except_expression);
fputs(") ", out);
*/
static void print_leave_statement(const leave_statement_t *statement)
{
- (void) statement;
+ (void)statement;
fputs("__leave;\n", out);
}
*/
void print_initializer(const initializer_t *initializer)
{
- if(initializer == NULL) {
+ if (initializer == NULL) {
fputs("{}", out);
return;
}
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: {
fputs("{ ", out);
const initializer_list_t *list = &initializer->list;
- for(size_t i = 0 ; i < list->len; ++i) {
+ for (size_t i = 0 ; i < list->len; ++i) {
const initializer_t *sub_init = list->initializers[i];
print_initializer(list->initializers[i]);
- if(i < list->len-1) {
- if(sub_init == NULL || sub_init->kind != INITIALIZER_DESIGNATOR)
+ if (i < list->len-1) {
+ if (sub_init == NULL || sub_init->kind != INITIALIZER_DESIGNATOR)
fputs(", ", out);
}
}
*/
static void print_ms_modifiers(const declaration_t *declaration)
{
- if((c_mode & _MS) == 0)
+ if ((c_mode & _MS) == 0)
return;
decl_modifiers_t modifiers = declaration->modifiers;
const char *next = "(";
if (declaration->base.kind == ENTITY_VARIABLE) {
- variable_t *variable = (variable_t*) declaration;
+ variable_t *variable = (variable_t*)declaration;
if (variable->alignment != 0
|| variable->get_property_sym != NULL
|| variable->put_property_sym != NULL) {
ds_shown = true;
}
- if(variable->alignment != 0) {
+ if (variable->alignment != 0) {
fputs(next, out); next = ", "; fprintf(out, "align(%u)", variable->alignment);
}
- if(variable->get_property_sym != NULL
+ 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) {
+ if (variable->get_property_sym != NULL) {
fprintf(out, "get=%s", variable->get_property_sym->string);
comma = ", ";
}
- if(variable->put_property_sym != NULL)
+ if (variable->put_property_sym != NULL)
fprintf(out, "%sput=%s", comma, variable->put_property_sym->string);
fputc(')', out);
}
fputs("__declspec", out);
ds_shown = true;
}
- if(modifiers & DM_DLLIMPORT) {
+ if (modifiers & DM_DLLIMPORT) {
fputs(next, out); next = ", "; fputs("dllimport", out);
}
- if(modifiers & DM_DLLEXPORT) {
+ if (modifiers & DM_DLLEXPORT) {
fputs(next, out); next = ", "; fputs("dllexport", out);
}
- if(modifiers & DM_THREAD) {
+ if (modifiers & DM_THREAD) {
fputs(next, out); next = ", "; fputs("thread", out);
}
- if(modifiers & DM_NAKED) {
+ if (modifiers & DM_NAKED) {
fputs(next, out); next = ", "; fputs("naked", out);
}
- if(modifiers & DM_THREAD) {
+ if (modifiers & DM_THREAD) {
fputs(next, out); next = ", "; fputs("thread", out);
}
- if(modifiers & DM_SELECTANY) {
+ if (modifiers & DM_SELECTANY) {
fputs(next, out); next = ", "; fputs("selectany", out);
}
- if(modifiers & DM_NOTHROW) {
+ if (modifiers & DM_NOTHROW) {
fputs(next, out); next = ", "; fputs("nothrow", out);
}
- if(modifiers & DM_NORETURN) {
+ if (modifiers & DM_NORETURN) {
fputs(next, out); next = ", "; fputs("noreturn", out);
}
- if(modifiers & DM_NOINLINE) {
+ if (modifiers & DM_NOINLINE) {
fputs(next, out); next = ", "; fputs("noinline", out);
}
if (modifiers & DM_DEPRECATED) {
fputs(next, out); next = ", "; fputs("deprecated", out);
- if(declaration->deprecated_string != NULL)
+ if (declaration->deprecated_string != NULL)
fprintf(out, "(\"%s\")",
declaration->deprecated_string);
}
- if(modifiers & DM_RESTRICT) {
+ if (modifiers & DM_RESTRICT) {
fputs(next, out); next = ", "; fputs("restrict", out);
}
- if(modifiers & DM_NOALIAS) {
+ if (modifiers & DM_NOALIAS) {
fputs(next, out); next = ", "; fputs("noalias", out);
}
}
assert(is_declaration(entity));
const declaration_t *declaration = &entity->declaration;
- print_storage_class((storage_class_tag_t) declaration->declared_storage_class);
+ print_storage_class((storage_class_tag_t)declaration->declared_storage_class);
if (entity->kind == ENTITY_FUNCTION) {
- function_t *function = (function_t*) declaration;
+ function_t *function = (function_t*)declaration;
if (function->is_inline) {
if (declaration->modifiers & DM_FORCEINLINE) {
fputs("__forceinline ", out);
if (entity->base.namespc != NAMESPACE_NORMAL && entity->base.symbol == NULL)
return;
- switch ((entity_kind_tag_t) entity->kind) {
+ switch ((entity_kind_tag_t)entity->kind) {
case ENTITY_VARIABLE:
+ case ENTITY_PARAMETER:
case ENTITY_COMPOUND_MEMBER:
print_declaration(entity);
return;
return is_constant_expression(initializer->value.value);
case INITIALIZER_LIST:
- for(size_t i = 0; i < initializer->list.len; ++i) {
+ for (size_t i = 0; i < initializer->list.len; ++i) {
initializer_t *sub_initializer = initializer->list.initializers[i];
- if(!is_constant_initializer(sub_initializer))
+ if (!is_constant_initializer(sub_initializer))
return false;
}
return true;
case EXPR_SELECT: {
type_t *base_type = skip_typeref(expression->select.compound->base.type);
- if(is_type_pointer(base_type)) {
+ if (is_type_pointer(base_type)) {
/* it's a -> */
return is_address_constant(expression->select.compound);
} else {
case EXPR_REFERENCE: {
entity_t *entity = expression->reference.entity;
if (is_declaration(entity)) {
- switch ((storage_class_tag_t) entity->declaration.storage_class) {
+ switch ((storage_class_tag_t)entity->declaration.storage_class) {
case STORAGE_CLASS_NONE:
case STORAGE_CLASS_EXTERN:
case STORAGE_CLASS_STATIC:
type_t *real_type
= revert_automatic_type_conversion(expression->unary.value);
/* dereferencing a function is a NOP */
- if(is_type_function(real_type)) {
+ if (is_type_function(real_type)) {
return is_address_constant(expression->unary.value);
}
-
- /* fallthrough */
+ /* FALLTHROUGH */
}
case EXPR_UNARY_CAST: {
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())
- )))
+ get_atomic_type_size(dest->atomic.akind) < get_atomic_type_size(get_intptr_kind())
+ ))
return false;
return (is_constant_expression(expression->unary.value)
expression_t *left = expression->binary.left;
expression_t *right = expression->binary.right;
- if(is_type_pointer(skip_typeref(left->base.type))) {
+ 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))) {
+ } else if (is_type_pointer(skip_typeref(right->base.type))) {
return is_constant_expression(left) && is_address_constant(right);
}
return false;
type_t *type = skip_typeref(entity->declaration.type);
- if(is_type_function(type))
+ if (is_type_function(type))
return true;
- if(is_type_array(type)) {
+ if (is_type_array(type)) {
return is_object_with_linker_constant_address(expression);
}
/* Prevent stray errors */
expression_t *compound = expression->select.compound;
type_t *compound_type = compound->base.type;
compound_type = skip_typeref(compound_type);
- if(is_type_pointer(compound_type)) {
+ if (is_type_pointer(compound_type)) {
return is_constant_pointer(compound);
} else {
return is_object_with_constant_address(compound);
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:
case EXPR_CONDITIONAL: {
expression_t *condition = expression->conditional.condition;
- if(!is_constant_expression(condition))
+ if (!is_constant_expression(condition))
return false;
long val = fold_constant(condition);
- if(val != 0)
+ if (val != 0)
return is_constant_expression(expression->conditional.true_expression);
else
return is_constant_expression(expression->conditional.false_expression);
projects / cparser / blobdiff