From fbca1bf49b3ec1c4b2c1b4defb5c533a00a6db0e Mon Sep 17 00:00:00 2001
From: Tacodiva <27910867+Tacodiva@users.noreply.github.com>
Date: Mon, 8 Sep 2025 11:48:55 +1000
Subject: [PATCH] Fixed `NaN = 0` wrongly reporting true, and add a test

---
 src/compiler/jsgen.js                         |   4 +-
 test/fixtures/execute/tw-NaN.sb3              | Bin 2773 -> 2869 bytes
 .../__snapshots__/tw-NaN.sb3.tw-snapshot      |  77 +++++++++---------
 .../__snapshots__/tw-tangent.sb3.tw-snapshot  |  14 ++--
 .../warp-timer/tw-NaN.sb3.tw-snapshot         |  77 +++++++++---------
 .../warp-timer/tw-tangent.sb3.tw-snapshot     |  14 ++--
 6 files changed, 96 insertions(+), 90 deletions(-)

diff --git a/src/compiler/jsgen.js b/src/compiler/jsgen.js
index 10e41eaa..82f6caf8 100644
--- a/src/compiler/jsgen.js
+++ b/src/compiler/jsgen.js
@@ -57,8 +57,8 @@ const isSafeInputForEqualsOptimization = (input, other) => {
     if (input.opcode !== InputOpcode.CONSTANT) return false;
     // Only optimize when the constant can always be thought of as a number
     if (input.isAlwaysType(InputType.NUMBER) || input.isAlwaysType(InputType.STRING_NUM)) {
-        if (other.isSometimesType(InputType.STRING_NAN) || other.isSometimesType(InputType.BOOLEAN_INTERPRETABLE)) {
-            // Never optimize 0 if the other input can be '' or a boolean.
+        if (other.isSometimesType(InputType.NUMBER_NAN | InputType.STRING_NAN | InputType.BOOLEAN_INTERPRETABLE)) {
+            // Never optimize 0 if the other input can be NaN, '' or a boolean.
             // eg. if '< 0 = "" >' was optimized it would turn into `0 === +""`,
             //  which would be true even though Scratch would return false.
             return (+input.inputs.value) !== 0;
diff --git a/test/fixtures/execute/tw-NaN.sb3 b/test/fixtures/execute/tw-NaN.sb3
index 17ddc26bdb14c47bb00600accae4b19495d903eb..411b0c6670dc97141a3da3f88a42f25a25e06e48 100644
GIT binary patch
delta 2305
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
b3Nr+2x5!YFeF_=@ZIhS^HwHlp00000jP_Al

delta 2208
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

diff --git a/test/snapshot/__snapshots__/tw-NaN.sb3.tw-snapshot b/test/snapshot/__snapshots__/tw-NaN.sb3.tw-snapshot
index 417094fe..537fd710 100644
--- a/test/snapshot/__snapshots__/tw-NaN.sb3.tw-snapshot
+++ b/test/snapshot/__snapshots__/tw-NaN.sb3.tw-snapshot
@@ -1,71 +1,74 @@
 // TW Snapshot
-// Input SHA-256: 2c124b6184d3cbeb3d692ba7a04266d8bf141c650a9cc43b28faf59ac394ee16
+// Input SHA-256: 7916f21ea252ad0887060c6eb7ade266b41077b30ed849ad33947e01e6f73514
 
 // Sprite1 script
 (function factoryXYZ(thread) { const target = thread.target; const runtime = target.runtime; const stage = runtime.getTargetForStage();
 const b0 = runtime.getOpcodeFunction("looks_say");
 return function* genXYZ () {
-yield* executeInCompatibilityLayer({"MESSAGE":"plan 20",}, b0, false, false, "v", null);
+yield* executeInCompatibilityLayer({"MESSAGE":"plan 21",}, b0, false, false, "B", null);
+if (!(("" + (0 / 0)).toLowerCase() === "0".toLowerCase())) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "aA", null);
+}
 if ((("" + (0 * Infinity)).toLowerCase() === "NaN".toLowerCase())) {
-yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "6", null);
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "/", null);
 }
 if (((((0 * Infinity) || 0) * 1) === 0)) {
-yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "#", null);
-}
-if ((("" + ((Math.acos(1.01) * 180) / Math.PI)).toLowerCase() === "NaN".toLowerCase())) {
-yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "9", null);
-}
-if ((((((Math.acos(1.01) * 180) / Math.PI) || 0) * 1) === 0)) {
-yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "(", null);
-}
-if ((("" + ((Math.asin(1.01) * 180) / Math.PI)).toLowerCase() === "NaN".toLowerCase())) {
-yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "*", null);
-}
-if ((((((Math.asin(1.01) * 180) / Math.PI) || 0) * 1) === 0)) {
-yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, ",", null);
-}
-if ((("" + (0 / 0)).toLowerCase() === "NaN".toLowerCase())) {
-yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, ".", null);
-}
-if (((((0 / 0) || 0) * 1) === 0)) {
-yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, ":", null);
-}
-if ((("" + Math.sqrt(-1)).toLowerCase() === "NaN".toLowerCase())) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "?", null);
 }
-if ((((Math.sqrt(-1) || 0) * 1) === 0)) {
-yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "@", null);
+if ((("" + ((Math.acos(1.01) * 180) / Math.PI)).toLowerCase() === "NaN".toLowerCase())) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "=", null);
 }
-if ((("" + mod(0, 0)).toLowerCase() === "NaN".toLowerCase())) {
+if ((((((Math.acos(1.01) * 180) / Math.PI) || 0) * 1) === 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "]", null);
 }
-if ((((mod(0, 0) || 0) * 1) === 0)) {
+if ((("" + ((Math.asin(1.01) * 180) / Math.PI)).toLowerCase() === "NaN".toLowerCase())) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "_", null);
 }
-if ((("" + Math.log(-1)).toLowerCase() === "NaN".toLowerCase())) {
+if ((((((Math.asin(1.01) * 180) / Math.PI) || 0) * 1) === 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "{", null);
 }
-if ((((Math.log(-1) || 0) * 1) === 0)) {
+if ((("" + (0 / 0)).toLowerCase() === "NaN".toLowerCase())) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "}", null);
 }
-if ((("" + (Math.log(-1) / Math.LN10)).toLowerCase() === "NaN".toLowerCase())) {
+if (((((0 / 0) || 0) * 1) === 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "aa", null);
 }
-if (((((Math.log(-1) / Math.LN10) || 0) * 1) === 0)) {
+if ((("" + Math.sqrt(-1)).toLowerCase() === "NaN".toLowerCase())) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "ac", null);
 }
-if (((((Math.round(Math.sin((Math.PI * ((1 / 0) || 0)) / 180) * 1e10) / 1e10) || 0) * 1) === 0)) {
+if ((((Math.sqrt(-1) || 0) * 1) === 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "ae", null);
 }
-if (((((Math.round(Math.cos((Math.PI * ((1 / 0) || 0)) / 180) * 1e10) / 1e10) || 0) * 1) === 0)) {
+if ((("" + mod(0, 0)).toLowerCase() === "NaN".toLowerCase())) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "ag", null);
 }
-if ((((tan(((1 / 0) || 0)) || 0) * 1) === 0)) {
+if ((((mod(0, 0) || 0) * 1) === 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "ai", null);
 }
-if ((((runtime.ext_scratch3_operators._random((-1 / 0), (1 / 0)) || 0) * 1) === 0)) {
+if ((("" + Math.log(-1)).toLowerCase() === "NaN".toLowerCase())) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "ak", null);
 }
-yield* executeInCompatibilityLayer({"MESSAGE":"end",}, b0, false, false, "7", null);
+if ((((Math.log(-1) || 0) * 1) === 0)) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "am", null);
+}
+if ((("" + (Math.log(-1) / Math.LN10)).toLowerCase() === "NaN".toLowerCase())) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "ao", null);
+}
+if (((((Math.log(-1) / Math.LN10) || 0) * 1) === 0)) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "aq", null);
+}
+if (((((Math.round(Math.sin((Math.PI * ((1 / 0) || 0)) / 180) * 1e10) / 1e10) || 0) * 1) === 0)) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "as", null);
+}
+if (((((Math.round(Math.cos((Math.PI * ((1 / 0) || 0)) / 180) * 1e10) / 1e10) || 0) * 1) === 0)) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "au", null);
+}
+if ((((tan(((1 / 0) || 0)) || 0) * 1) === 0)) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "aw", null);
+}
+if ((((runtime.ext_scratch3_operators._random((-1 / 0), (1 / 0)) || 0) * 1) === 0)) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "ax", null);
+}
+yield* executeInCompatibilityLayer({"MESSAGE":"end",}, b0, false, false, ":", null);
 retire(); return;
 }; })
diff --git a/test/snapshot/__snapshots__/tw-tangent.sb3.tw-snapshot b/test/snapshot/__snapshots__/tw-tangent.sb3.tw-snapshot
index 17992397..b2ccf9ce 100644
--- a/test/snapshot/__snapshots__/tw-tangent.sb3.tw-snapshot
+++ b/test/snapshot/__snapshots__/tw-tangent.sb3.tw-snapshot
@@ -6,31 +6,31 @@
 const b0 = runtime.getOpcodeFunction("looks_say");
 return function* genXYZ () {
 yield* executeInCompatibilityLayer({"MESSAGE":"plan 15",}, b0, false, false, "p", null);
-if (((tan(0) || 0) === 0)) {
+if (compareEqual(tan(0), 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass 0",}, b0, false, false, "O", null);
 }
 if (((tan(90) || 0) === Infinity)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass 90",}, b0, false, false, "G", null);
 }
-if (((tan(180) || 0) === 0)) {
+if (compareEqual(tan(180), 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass 180",}, b0, false, false, "I", null);
 }
 if (((tan(270) || 0) === -Infinity)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass 270",}, b0, false, false, "K", null);
 }
-if (((tan(360) || 0) === 0)) {
+if (compareEqual(tan(360), 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass 360",}, b0, false, false, "M", null);
 }
 if (((tan(450) || 0) === Infinity)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass 450",}, b0, false, false, "Q", null);
 }
-if (((tan(540) || 0) === 0)) {
+if (compareEqual(tan(540), 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass 540",}, b0, false, false, "S", null);
 }
 if (((tan(630) || 0) === -Infinity)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass 630",}, b0, false, false, "U", null);
 }
-if (((tan(720) || 0) === 0)) {
+if (compareEqual(tan(720), 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass 720",}, b0, false, false, "W", null);
 }
 if (((tan(810) || 0) === Infinity)) {
@@ -39,13 +39,13 @@ yield* executeInCompatibilityLayer({"MESSAGE":"pass 810",}, b0, false, false, "Y
 if (((tan(-90) || 0) === -Infinity)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass -90",}, b0, false, false, "0", null);
 }
-if (((tan(-180) || 0) === 0)) {
+if (compareEqual(tan(-180), 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass -180",}, b0, false, false, "2", null);
 }
 if (((tan(-270) || 0) === Infinity)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass -270",}, b0, false, false, "4", null);
 }
-if (((tan(-360) || 0) === 0)) {
+if (compareEqual(tan(-360), 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass -360",}, b0, false, false, "6", null);
 }
 if (((tan(-450) || 0) === -Infinity)) {
diff --git a/test/snapshot/__snapshots__/warp-timer/tw-NaN.sb3.tw-snapshot b/test/snapshot/__snapshots__/warp-timer/tw-NaN.sb3.tw-snapshot
index 417094fe..537fd710 100644
--- a/test/snapshot/__snapshots__/warp-timer/tw-NaN.sb3.tw-snapshot
+++ b/test/snapshot/__snapshots__/warp-timer/tw-NaN.sb3.tw-snapshot
@@ -1,71 +1,74 @@
 // TW Snapshot
-// Input SHA-256: 2c124b6184d3cbeb3d692ba7a04266d8bf141c650a9cc43b28faf59ac394ee16
+// Input SHA-256: 7916f21ea252ad0887060c6eb7ade266b41077b30ed849ad33947e01e6f73514
 
 // Sprite1 script
 (function factoryXYZ(thread) { const target = thread.target; const runtime = target.runtime; const stage = runtime.getTargetForStage();
 const b0 = runtime.getOpcodeFunction("looks_say");
 return function* genXYZ () {
-yield* executeInCompatibilityLayer({"MESSAGE":"plan 20",}, b0, false, false, "v", null);
+yield* executeInCompatibilityLayer({"MESSAGE":"plan 21",}, b0, false, false, "B", null);
+if (!(("" + (0 / 0)).toLowerCase() === "0".toLowerCase())) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "aA", null);
+}
 if ((("" + (0 * Infinity)).toLowerCase() === "NaN".toLowerCase())) {
-yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "6", null);
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "/", null);
 }
 if (((((0 * Infinity) || 0) * 1) === 0)) {
-yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "#", null);
-}
-if ((("" + ((Math.acos(1.01) * 180) / Math.PI)).toLowerCase() === "NaN".toLowerCase())) {
-yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "9", null);
-}
-if ((((((Math.acos(1.01) * 180) / Math.PI) || 0) * 1) === 0)) {
-yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "(", null);
-}
-if ((("" + ((Math.asin(1.01) * 180) / Math.PI)).toLowerCase() === "NaN".toLowerCase())) {
-yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "*", null);
-}
-if ((((((Math.asin(1.01) * 180) / Math.PI) || 0) * 1) === 0)) {
-yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, ",", null);
-}
-if ((("" + (0 / 0)).toLowerCase() === "NaN".toLowerCase())) {
-yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, ".", null);
-}
-if (((((0 / 0) || 0) * 1) === 0)) {
-yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, ":", null);
-}
-if ((("" + Math.sqrt(-1)).toLowerCase() === "NaN".toLowerCase())) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "?", null);
 }
-if ((((Math.sqrt(-1) || 0) * 1) === 0)) {
-yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "@", null);
+if ((("" + ((Math.acos(1.01) * 180) / Math.PI)).toLowerCase() === "NaN".toLowerCase())) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "=", null);
 }
-if ((("" + mod(0, 0)).toLowerCase() === "NaN".toLowerCase())) {
+if ((((((Math.acos(1.01) * 180) / Math.PI) || 0) * 1) === 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "]", null);
 }
-if ((((mod(0, 0) || 0) * 1) === 0)) {
+if ((("" + ((Math.asin(1.01) * 180) / Math.PI)).toLowerCase() === "NaN".toLowerCase())) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "_", null);
 }
-if ((("" + Math.log(-1)).toLowerCase() === "NaN".toLowerCase())) {
+if ((((((Math.asin(1.01) * 180) / Math.PI) || 0) * 1) === 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "{", null);
 }
-if ((((Math.log(-1) || 0) * 1) === 0)) {
+if ((("" + (0 / 0)).toLowerCase() === "NaN".toLowerCase())) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "}", null);
 }
-if ((("" + (Math.log(-1) / Math.LN10)).toLowerCase() === "NaN".toLowerCase())) {
+if (((((0 / 0) || 0) * 1) === 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "aa", null);
 }
-if (((((Math.log(-1) / Math.LN10) || 0) * 1) === 0)) {
+if ((("" + Math.sqrt(-1)).toLowerCase() === "NaN".toLowerCase())) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "ac", null);
 }
-if (((((Math.round(Math.sin((Math.PI * ((1 / 0) || 0)) / 180) * 1e10) / 1e10) || 0) * 1) === 0)) {
+if ((((Math.sqrt(-1) || 0) * 1) === 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "ae", null);
 }
-if (((((Math.round(Math.cos((Math.PI * ((1 / 0) || 0)) / 180) * 1e10) / 1e10) || 0) * 1) === 0)) {
+if ((("" + mod(0, 0)).toLowerCase() === "NaN".toLowerCase())) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "ag", null);
 }
-if ((((tan(((1 / 0) || 0)) || 0) * 1) === 0)) {
+if ((((mod(0, 0) || 0) * 1) === 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "ai", null);
 }
-if ((((runtime.ext_scratch3_operators._random((-1 / 0), (1 / 0)) || 0) * 1) === 0)) {
+if ((("" + Math.log(-1)).toLowerCase() === "NaN".toLowerCase())) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "ak", null);
 }
-yield* executeInCompatibilityLayer({"MESSAGE":"end",}, b0, false, false, "7", null);
+if ((((Math.log(-1) || 0) * 1) === 0)) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "am", null);
+}
+if ((("" + (Math.log(-1) / Math.LN10)).toLowerCase() === "NaN".toLowerCase())) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "ao", null);
+}
+if (((((Math.log(-1) / Math.LN10) || 0) * 1) === 0)) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "aq", null);
+}
+if (((((Math.round(Math.sin((Math.PI * ((1 / 0) || 0)) / 180) * 1e10) / 1e10) || 0) * 1) === 0)) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "as", null);
+}
+if (((((Math.round(Math.cos((Math.PI * ((1 / 0) || 0)) / 180) * 1e10) / 1e10) || 0) * 1) === 0)) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "au", null);
+}
+if ((((tan(((1 / 0) || 0)) || 0) * 1) === 0)) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "aw", null);
+}
+if ((((runtime.ext_scratch3_operators._random((-1 / 0), (1 / 0)) || 0) * 1) === 0)) {
+yield* executeInCompatibilityLayer({"MESSAGE":"pass",}, b0, false, false, "ax", null);
+}
+yield* executeInCompatibilityLayer({"MESSAGE":"end",}, b0, false, false, ":", null);
 retire(); return;
 }; })
diff --git a/test/snapshot/__snapshots__/warp-timer/tw-tangent.sb3.tw-snapshot b/test/snapshot/__snapshots__/warp-timer/tw-tangent.sb3.tw-snapshot
index 17992397..b2ccf9ce 100644
--- a/test/snapshot/__snapshots__/warp-timer/tw-tangent.sb3.tw-snapshot
+++ b/test/snapshot/__snapshots__/warp-timer/tw-tangent.sb3.tw-snapshot
@@ -6,31 +6,31 @@
 const b0 = runtime.getOpcodeFunction("looks_say");
 return function* genXYZ () {
 yield* executeInCompatibilityLayer({"MESSAGE":"plan 15",}, b0, false, false, "p", null);
-if (((tan(0) || 0) === 0)) {
+if (compareEqual(tan(0), 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass 0",}, b0, false, false, "O", null);
 }
 if (((tan(90) || 0) === Infinity)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass 90",}, b0, false, false, "G", null);
 }
-if (((tan(180) || 0) === 0)) {
+if (compareEqual(tan(180), 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass 180",}, b0, false, false, "I", null);
 }
 if (((tan(270) || 0) === -Infinity)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass 270",}, b0, false, false, "K", null);
 }
-if (((tan(360) || 0) === 0)) {
+if (compareEqual(tan(360), 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass 360",}, b0, false, false, "M", null);
 }
 if (((tan(450) || 0) === Infinity)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass 450",}, b0, false, false, "Q", null);
 }
-if (((tan(540) || 0) === 0)) {
+if (compareEqual(tan(540), 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass 540",}, b0, false, false, "S", null);
 }
 if (((tan(630) || 0) === -Infinity)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass 630",}, b0, false, false, "U", null);
 }
-if (((tan(720) || 0) === 0)) {
+if (compareEqual(tan(720), 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass 720",}, b0, false, false, "W", null);
 }
 if (((tan(810) || 0) === Infinity)) {
@@ -39,13 +39,13 @@ yield* executeInCompatibilityLayer({"MESSAGE":"pass 810",}, b0, false, false, "Y
 if (((tan(-90) || 0) === -Infinity)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass -90",}, b0, false, false, "0", null);
 }
-if (((tan(-180) || 0) === 0)) {
+if (compareEqual(tan(-180), 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass -180",}, b0, false, false, "2", null);
 }
 if (((tan(-270) || 0) === Infinity)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass -270",}, b0, false, false, "4", null);
 }
-if (((tan(-360) || 0) === 0)) {
+if (compareEqual(tan(-360), 0)) {
 yield* executeInCompatibilityLayer({"MESSAGE":"pass -360",}, b0, false, false, "6", null);
 }
 if (((tan(-450) || 0) === -Infinity)) {