X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast.c;h=c0e6b1d9165197321872673e66697b8d6f504b15;hb=0da75194a7e7c0d1c8a157e107fad866b3e14b84;hp=617f636bfb4beb81d4388e7d059535d627d81cd0;hpb=1842f87f00887ea5ba75e510d825935f4602faee;p=cparser

diff --git a/ast.c b/ast.c
index 617f636..c0e6b1d 100644
--- a/ast.c
+++ b/ast.c
@@ -538,7 +538,7 @@ static void print_va_start(const va_start_expression_t *const expression)
 	print_string("__builtin_va_start(");
 	print_assignment_expression(expression->ap);
 	print_string(", ");
-	print_string(expression->parameter->base.base.symbol->string);
+	print_assignment_expression(expression->parameter);
 	print_char(')');
 }
 
@@ -650,6 +650,33 @@ static void print_statement_expression(const statement_expression_t *expression)
 	print_char(')');
 }
 
+static bool needs_parentheses(expression_t const *const expr, unsigned const top_prec)
+{
+	if (expr->base.parenthesized)
+		return true;
+
+	if (top_prec > get_expression_precedence(expr->base.kind))
+		return true;
+
+	if (print_parenthesis && top_prec != PREC_BOTTOM) {
+		switch (expr->kind) {
+		case EXPR_ENUM_CONSTANT:
+		case EXPR_FUNCNAME:
+		case EXPR_LITERAL_CASES:
+		case EXPR_REFERENCE:
+		case EXPR_STRING_LITERAL:
+		case EXPR_WIDE_STRING_LITERAL:
+			/* Do not print () around subexpressions consisting of a single token. */
+			return false;
+
+		default:
+			return true;
+		}
+	}
+
+	return false;
+}
+
 /**
  * Prints an expression with parenthesis if needed.
  *
@@ -662,10 +689,7 @@ static void print_expression_prec(expression_t const *expr, unsigned const top_p
 		expr = expr->unary.value;
 	}
 
-	bool parenthesized =
-		expr->base.parenthesized                       ||
-		(print_parenthesis && top_prec != PREC_BOTTOM) ||
-		top_prec > get_expression_precedence(expr->base.kind);
+	bool const parenthesized = needs_parentheses(expr, top_prec);
 
 	if (parenthesized)
 		print_char('(');