Merge pull request #7270 from RazvanN7/Issue_16649

Fix Issue 16649 - Header gen skips parens merged-on-behalf-of: Andrei Alexandrescu <andralex@users.noreply.github.com>
dlang · Oct 31, 2017 · f344696 · f344696
2 parents 7f808c8 + 11c6190
commit f344696
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/src/ddmd/hdrgen.d b/src/ddmd/hdrgen.d
@@ -2204,7 +2204,8 @@ public:
         /* Despite precedence, we don't allow a<b<c expressions.
          * They must be parenthesized.
          */
-        if (precedence[e.op] < pr || (pr == PREC.rel && precedence[e.op] == pr))
+        if (precedence[e.op] < pr || (pr == PREC.rel && precedence[e.op] == pr)
+            || (pr >= PREC.or && pr <= PREC.and && precedence[e.op] == PREC.rel))
         {
             buf.writeByte('(');
             e.accept(this);

diff --git a/test/compilable/extra-files/header2.d b/test/compilable/extra-files/header2.d
@@ -150,3 +150,11 @@ align (true ? 2 : 3):
 align:
     int var2;
 }
+
+// 16649
+void leFoo()()
+{
+    sign = a == 2 ? false : (y < 0) ^ sign;
+    sign = a == 2 ? false : sign ^ (y < 0);
+    sign = 2 + 3 | 7 + 5;
+}
diff --git a/test/compilable/extra-files/header2.di b/test/compilable/extra-files/header2.di
@@ -108,3 +108,9 @@ align (1) struct S9766
 		align int var2;
 	}
 }
+void leFoo()()
+{
+	sign = a == 2 ? false : (y < 0) ^ sign;
+	sign = a == 2 ? false : sign ^ (y < 0);
+	sign = 2 + 3 | 7 + 5;
+}
diff --git a/test/compilable/extra-files/header2i.di b/test/compilable/extra-files/header2i.di
@@ -210,3 +210,9 @@ align (1) struct S9766
 		align int var2;
 	}
 }
+void leFoo()()
+{
+	sign = a == 2 ? false : (y < 0) ^ sign;
+	sign = a == 2 ? false : sign ^ (y < 0);
+	sign = 2 + 3 | 7 + 5;
+}