X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast.c;h=498393c851ad9af32158e7214366fde6c0c2c875;hb=abfe00dd0c1451f075c0a5863d44259ef8891657;hp=c084a7f2220b6050bc42b0d552982dc93d9bef88;hpb=07431fba71121c10a9b99e32c988cebc0dae5587;p=cparser

diff --git a/ast.c b/ast.c
index c084a7f..498393c 100644
--- a/ast.c
+++ b/ast.c
@@ -382,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.
  *
@@ -400,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;
 	}
@@ -493,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;
 
@@ -595,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);
 }
 
@@ -607,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);
 }
@@ -646,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);
@@ -660,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);
@@ -692,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);
 }
 
@@ -753,10 +758,13 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p
 	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:
@@ -843,7 +851,7 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p
 		fprintf(out, "some expression of type %d", (int)expression->kind);
 		break;
 	}
-	if (top_prec > prec)
+	if (parenthesized)
 		fputc(')', out);
 }
 
@@ -879,10 +887,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);
+	}
 }
 
 /**
@@ -1036,9 +1048,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))
@@ -1335,7 +1351,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: {