Print scalar initialisers as assignment expressions instead of plain expressions...

[cparser] / ast.c

diff --git a/ast.c b/ast.c
index 201576e..38b9980 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -168,7 +168,6 @@ static unsigned get_expression_precedence(expression_kind_t kind)
                [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,
@@ -365,9 +364,7 @@ static void print_funcname(const funcname_expression_t *funcname)
        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(
@@ -385,6 +382,11 @@ static void print_compound_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.
  *
@@ -403,7 +405,7 @@ static void print_call_expression(const call_expression_t *call)
                } else {
                        first = 0;
                }
-               print_expression_prec(argument->expression, PREC_ASSIGNMENT);
+               print_assignment_expression(argument->expression);
 
                argument = argument->next;
        }
@@ -420,15 +422,6 @@ static void print_binary_expression(const binary_expression_t *binexpr)
        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) {
@@ -505,7 +498,7 @@ static void print_unary_expression(const unary_expression_t *unexpr)
                break;
        case EXPR_UNARY_ASSUME:
                fputs("__assume(", out);
-               print_expression_prec(unexpr->value, PREC_ASSIGNMENT);
+               print_assignment_expression(unexpr->value);
                fputc(')', out);
                return;
 
@@ -607,7 +600,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_ASSIGNMENT);
+       print_assignment_expression(expression->value);
        fputc(')', out);
 }
 
@@ -619,14 +612,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_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);
 }
@@ -658,7 +651,7 @@ 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_ASSIGNMENT);
+       print_assignment_expression(expression->ap);
        fputs(", ", out);
        fputs(expression->parameter->base.base.symbol->string, out);
        fputc(')', out);
@@ -672,7 +665,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_ASSIGNMENT);
+       print_assignment_expression(expression->ap);
        fputs(", ", out);
        print_type(expression->base.type);
        fputc(')', out);
@@ -704,7 +697,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_ASSIGNMENT);
+       print_assignment_expression(expr->type_expression);
        fputc(')', out);
 }
 
@@ -891,10 +884,14 @@ static void print_compound_statement(const compound_statement_t *block)
  */
 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);
+       }
 }
 
 /**
@@ -1020,7 +1017,7 @@ static void print_typedef(const entity_t *entity)
 {
        fputs("typedef ", out);
        print_type_ext(entity->typedefe.type, entity->base.symbol, NULL);
-       fputs(";", out);
+       fputc(';', out);
 }
 
 /**
@@ -1048,9 +1045,13 @@ static void print_declaration_statement(
 {
        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))
@@ -1347,7 +1348,7 @@ void print_initializer(const initializer_t *initializer)
        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: {
@@ -1575,6 +1576,7 @@ void print_entity(const entity_t *entity)
 
        switch ((entity_kind_tag_t)entity->kind) {
        case ENTITY_VARIABLE:
+       case ENTITY_PARAMETER:
        case ENTITY_COMPOUND_MEMBER:
                print_declaration(entity);
                return;
@@ -1950,7 +1952,6 @@ bool is_constant_expression(const expression_t *expression)
        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: