From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 21 Dec 2020 12:52:54 +0000 (+0100)
Subject: codewriter: Wrap AddressofExpression and PointerIndirection in parens
X-Git-Tag: 0.51.1~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60f257854f2ed0f2fd24101112fd75b65494572b;p=thirdparty%2Fvala.git

codewriter: Wrap AddressofExpression and PointerIndirection in parens
---

diff --git a/vala/valaaddressofexpression.vala b/vala/valaaddressofexpression.vala
index 0f3233422..d271d0cc4 100644
--- a/vala/valaaddressofexpression.vala
+++ b/vala/valaaddressofexpression.vala
@@ -65,7 +65,7 @@ public class Vala.AddressofExpression : Expression {
 	}
 
 	public override string to_string () {
-		return "&" + inner.to_string ();
+		return "(&%s)".printf (inner.to_string ());
 	}
 
 	public override void replace_expression (Expression old_node, Expression new_node) {
diff --git a/vala/valacodewriter.vala b/vala/valacodewriter.vala
index f555b7a02..cc2196347 100644
--- a/vala/valacodewriter.vala
+++ b/vala/valacodewriter.vala
@@ -1424,13 +1424,15 @@ public class Vala.CodeWriter : CodeVisitor {
 	}
 
 	public override void visit_pointer_indirection (PointerIndirection expr) {
-		write_string ("*");
+		write_string ("(*");
 		expr.inner.accept (this);
+		write_string (")");
 	}
 
 	public override void visit_addressof_expression (AddressofExpression expr) {
-		write_string ("&");
+		write_string ("(&");
 		expr.inner.accept (this);
+		write_string (")");
 	}
 
 	public override void visit_reference_transfer_expression (ReferenceTransferExpression expr) {