fix missing parentheses around NaN/Infinity shorthands (#1726)

fixes #1724
fixes #1725

2 files changed, 27 insertions, 1 deletions

diff --git a/lib/output.js b/lib/output.js
index d71f6aac..c8c8739f 100644
--- a/lib/output.js
+++ b/lib/output.js
@@ -596,7 +596,9 @@ function OutputStream(options) {
         var p = output.parent();
         return p instanceof AST_PropAccess && p.expression === this
             || p instanceof AST_Call && p.expression === this
-            || p instanceof AST_Unary && p.operator != "+" && p.operator != "-";
+            || p instanceof AST_Unary && p.operator != "+" && p.operator != "-"
+            || p instanceof AST_Binary && p.right === this
+                && (p.operator == "/" || p.operator == "%");
     });
 
     PARENS(AST_Seq, function(output){
diff --git a/test/compress/issue-597.js b/test/compress/issue-597.js
index 3a501532..2aaaf3f1 100644
--- a/test/compress/issue-597.js
+++ b/test/compress/issue-597.js
@@ -107,3 +107,27 @@ beautify_on_2: {
     }
     expect_exact: "console.log(null.toString(), (void 0).toString());"
 }
+
+issue_1724: {
+    input: {
+        var a = 0;
+        ++a % Infinity | Infinity ? a++ : 0;
+        console.log(a);
+    }
+    expect: {
+        var a = 0;
+        ++a % (1/0) | 1/0 ? a++ : 0;
+        console.log(a);
+    }
+    expect_stdout: "2"
+}
+
+issue_1725: {
+    input: {
+        ([].length === 0) % Infinity ? console.log("PASS") : console.log("FAIL");
+    }
+    expect: {
+        (0 === [].length) % (1/0) ? console.log("PASS") : console.log("FAIL");
+    }
+    expect_stdout: "PASS"
+}