From c642b183e78d916974b591da13139dcf9176dca2 Mon Sep 17 00:00:00 2001
From: jberg <jberg@users.noreply.github.com>
Date: Fri, 12 Jul 2019 14:49:57 -0700
Subject: [PATCH] More basic tests (#805)

* add more basic tests

* add/update passing test strings

* only coerce if int is on LHS
---
 .../src/maki-interpreter/interpreter.test.js  |  38 +++--
 .../basicTests.m                              | 150 +++++++++++++++---
 .../basicTests.maki                           | Bin 6161 -> 8698 bytes
 .../v1.1.1.b3 (Winamp 3.0 full)/basicTests.m  | 150 +++++++++++++++---
 .../basicTests.maki                           | Bin 6241 -> 8778 bytes
 .../v1.1.13 (Winamp 5.02)/basicTests.m        | 150 +++++++++++++++---
 .../v1.1.13 (Winamp 5.02)/basicTests.maki     | Bin 6932 -> 9605 bytes
 .../v1.2.0 (Winamp 5.66)/basicTests.m         | 150 +++++++++++++++---
 .../v1.2.0 (Winamp 5.66)/basicTests.maki      | Bin 7127 -> 9698 bytes
 .../src/maki-interpreter/virtualMachine.js    |   6 -
 10 files changed, 539 insertions(+), 105 deletions(-)

diff --git a/experiments/modern/src/maki-interpreter/interpreter.test.js b/experiments/modern/src/maki-interpreter/interpreter.test.js
index 5c4f64ed..f758f8d4 100644
--- a/experiments/modern/src/maki-interpreter/interpreter.test.js
+++ b/experiments/modern/src/maki-interpreter/interpreter.test.js
@@ -79,11 +79,18 @@ describe("can use basic operators", () => {
         [
           "2 + 2 = 4",
           "2.2 + 2.2 = 4.4",
+          "4 + 4.4 = 4.4 + 4 (not implict casting)",
+          "#t + #t = 2",
           "3 - 2 = 1",
           "3 - -2 = 5",
           "3.5 - 2 = 1.5",
           "2 * 3 = 6",
           "2 * 1.5 = 3",
+          "#t * 3 = 3",
+          "#f * 3 = 0",
+          "#t * 0.25 = 0.25",
+          "0.25 * #t = 0.25",
+          "#f * 0.25 = 0",
           "6 / 3 = 2",
           "3 / 2 = 1.5",
           "5 % 2 = 1",
@@ -98,27 +105,36 @@ describe("can use basic operators", () => {
           "1 < 2",
           "2 > 1",
           "[int] 4 = [float] 4.4 (autocasting types)",
+          "! [float] 4.4 = [int] 4 (not autocasting types)",
+          "[float] 4.4 != [int] 4 (not autocasting types)",
+          "! [int] 4 != [float] 4.4 (autocasting types)",
           "[int] 4 <= [float] 4.4 (autocasting types)",
           "[int] 4 >= [float] 4.4 (autocasting types)",
+          "! [float] 4.4 <= [int] 4 (not autocasting types)",
+          "[float] 4.4 >= [int] 4 (not autocasting types)",
           "! [int] 4 < [float] 4.4 (autocasting types)",
+          "! [float] 4.4 < [int] 4 (not autocasting types)",
           "! [int] 4 > [float] 4.4 (autocasting types)",
+          "[float] 4.4 > [int] 4 (not autocasting types)",
           "1++ = 1",
           "1++ (after incremeent) = 2",
           "2-- = 2",
           "2-- (after decrement) = 1",
           "++1 = 2",
-          "!f",
+          "!#f",
           "!0",
-          "!1 == 0",
-          "1 == 1",
-          "0 == 0",
-          "1 && 1",
-          "!(1 && 0)",
-          "!(0 && 0)",
-          "1 || 1",
-          "1 || 0",
-          "0 || 1",
-          "!(0 || 0)",
+          "!1 == #f",
+          "1 == #t",
+          "0 == #f",
+          "#t && #t",
+          "!(#t && #f)",
+          "!(#f && #f)",
+          "#t || #t",
+          "#t || #f",
+          "#f || #t",
+          "!(#f || #f)",
+          "#t || ++n (doesn't short circuit)",
+          "!(#f && ++ n) (doesn\'t short circuit)"
         ].map(successOutputFromMessage)
       );
     });
diff --git a/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.m b/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.m
index ab08372f..18f14911 100755
--- a/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.m	
+++ b/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.m	
@@ -16,6 +16,18 @@ System.onScriptLoaded()
         messageBox("2.2 + 2.2 = 4.4", "Fail", 1, "");
     }
 
+    if (sum + sumFloat == sumFloat + sum) {
+        messageBox("4 + 4.4 = 4.4 + 4 (not implict casting)", "Success", 0, "");
+    } else {
+        messageBox("4 + 4.4 = 4.4 + 4 (not implict casting)", "Fail", 1, "");
+    }
+
+    if (true + true == 2) {
+        messageBox("#t + #t = 2", "Success", 0, "");
+    } else {
+        messageBox("#t + #t = 2", "Fail", 1, "");
+    }
+
     if (3 - 2 == 1) {
         messageBox("3 - 2 = 1", "Success", 0, "");
     } else {
@@ -46,6 +58,36 @@ System.onScriptLoaded()
         messageBox("2 * 1.5 = 3", "Fail", 1, "");
     }
 
+    if (true * 3 == 3) {
+        messageBox("#t * 3 = 3", "Success", 0, "");
+    } else {
+        messageBox("#t * 3 = 3", "Fail", 1, "");
+    }
+
+    if (false * 3 == 0) {
+        messageBox("#f * 3 = 0", "Success", 0, "");
+    } else {
+        messageBox("#f * 3 = 0", "Fail", 1, "");
+    }
+
+    if (true * 0.25 == 0.25) {
+        messageBox("#t * 0.25 = 0.25", "Success", 0, "");
+    } else {
+        messageBox("#t * 0.25 = 0.25", "Fail", 1, "");
+    }
+
+    if (0.25 * true == 0.25) {
+        messageBox("0.25 * #t = 0.25", "Success", 0, "");
+    } else {
+        messageBox("0.25 * #t = 0.25", "Fail", 1, "");
+    }
+
+    if (false * 0.25 == 0) {
+        messageBox("#f * 0.25 = 0", "Success", 0, "");
+    } else {
+        messageBox("#f * 0.25 = 0", "Fail", 1, "");
+    }
+
     if (6 / 3 == 2) {
         messageBox("6 / 3 = 2", "Success", 0, "");
     } else {
@@ -132,6 +174,24 @@ System.onScriptLoaded()
         messageBox("[int] 4 = [float] 4.4 (autocasting types)", "Fail", 1, "");
     }
 
+    if (!(sumFloat == sum)) {
+        messageBox("! [float] 4.4 = [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("! [float] 4.4 = [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
+    if (sumFloat != sum) {
+        messageBox("[float] 4.4 != [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("[float] 4.4 != [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
+    if (!(sum != sumFloat)) {
+        messageBox("! [int] 4 != [float] 4.4 (autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("! [int] 4 != [float] 4.4 (autocasting types)", "Fail", 1, "");
+    }
+
     if (sum <= sumFloat) {
         messageBox("[int] 4 <= [float] 4.4 (autocasting types)", "Success", 0, "");
     } else {
@@ -144,18 +204,43 @@ System.onScriptLoaded()
         messageBox("[int] 4 >= [float] 4.4 (autocasting types)", "Fail", 1, "");
     }
 
+    if (!(sumFloat <= sum)) {
+        messageBox("! [float] 4.4 <= [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("! [float] 4.4 <= [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
+    if (sumFloat >= sum) {
+        messageBox("[float] 4.4 >= [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("[float] 4.4 >= [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
+
     if (!(sum < sumFloat)) {
         messageBox("! [int] 4 < [float] 4.4 (autocasting types)", "Success", 0, "");
     } else {
         messageBox("! [int] 4 < [float] 4.4 (autocasting types)", "Fail", 1, "");
     }
 
+    if (!(sumFloat < sum)) {
+        messageBox("! [float] 4.4 < [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("! [float] 4.4 < [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
     if (!(sum > sumFloat)) {
         messageBox("! [int] 4 > [float] 4.4 (autocasting types)", "Success", 0, "");
     } else {
         messageBox("! [int] 4 > [float] 4.4 (autocasting types)", "Fail", 1, "");
     }
 
+    if (sumFloat > sum) {
+        messageBox("[float] 4.4 > [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("[float] 4.4 > [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
     Int tempOne = 1;
     if (tempOne++ == one) {
         messageBox("1++ = 1", "Success", 0, "");
@@ -204,9 +289,9 @@ System.onScriptLoaded()
 
     Boolean f = false;
     if (!f) {
-        messageBox("!f", "Success", 0, "");
+        messageBox("!#f", "Success", 0, "");
     } else {
-        messageBox("!f", "Fail", 1, "");
+        messageBox("!#f", "Fail", 1, "");
     }
 
     if (!0) {
@@ -216,62 +301,83 @@ System.onScriptLoaded()
     }
 
     if (!1 == false) {
-        messageBox("!1 == false", "Success", 0, "");
+        messageBox("!1 == #f", "Success", 0, "");
     } else {
-        messageBox("!1 == false", "Fail", 1, "");
+        messageBox("!1 == #f", "Fail", 1, "");
     }
 
     if (1 == true) {
-        messageBox("1 == true", "Success", 0, "");
+        messageBox("1 == #t", "Success", 0, "");
     } else {
-        messageBox("1 == true", "Fail", 1, "");
+        messageBox("1 == #t", "Fail", 1, "");
     }
 
     if (0 == false) {
-        messageBox("0 == false", "Success", 0, "");
+        messageBox("0 == #f", "Success", 0, "");
     } else {
-        messageBox("0 == false", "Fail", 1, "");
+        messageBox("0 == #f", "Fail", 1, "");
     }
 
     if (true && true) {
-        messageBox("true && true", "Success", 0, "");
+        messageBox("#t && #t", "Success", 0, "");
     } else {
-        messageBox("true && true", "Fail", 1, "");
+        messageBox("#t && #t", "Fail", 1, "");
     }
 
     if (!(true && false)) {
-        messageBox("!(true && false)", "Success", 0, "");
+        messageBox("!(#t && #f)", "Success", 0, "");
     } else {
-        messageBox("!(true && false)", "Fail", 1, "");
+        messageBox("!(#t && #f)", "Fail", 1, "");
     }
 
     if (!(false && false)) {
-        messageBox("!(false && false)", "Success", 0, "");
+        messageBox("!(#f && #f)", "Success", 0, "");
     } else {
-        messageBox("!(false && false)", "Fail", 1, "");
+        messageBox("!(#f && #f)", "Fail", 1, "");
     }
 
     if (true || true) {
-        messageBox("true || true", "Success", 0, "");
+        messageBox("#t || #t", "Success", 0, "");
     } else {
-        messageBox("true || true", "Fail", 1, "");
+        messageBox("#t || #t", "Fail", 1, "");
     }
 
     if (true || false) {
-        messageBox("true || false", "Success", 0, "");
+        messageBox("#t || #f", "Success", 0, "");
     } else {
-        messageBox("true || false", "Fail", 1, "");
+        messageBox("#t || #f", "Fail", 1, "");
     }
 
     if (false || true) {
-        messageBox("false || true", "Success", 0, "");
+        messageBox("#f || #t", "Success", 0, "");
     } else {
-        messageBox("false || true", "Fail", 1, "");
+        messageBox("#f || #t", "Fail", 1, "");
     }
 
     if (!(false || false)) {
-        messageBox("!(false || false)", "Success", 0, "");
+        messageBox("!(#f || #f)", "Success", 0, "");
     } else {
-        messageBox("!(false || false)", "Fail", 1, "");
+        messageBox("!(#f || #f)", "Fail", 1, "");
+    }
+
+    Int n = 1;
+    if (true || ++n) {
+        if (n == 2) {
+            messageBox("#t || ++n (doesn't short circuit)", "Success", 0, "");
+        } else {
+            messageBox("#t || ++n (did short circuit)", "Fail", 1, "");
+        }
+    } else {
+        messageBox("#t || ++n", "Fail", 1, "");
+    }
+
+    if (!(false && ++n)) {
+        if (n == 3) {
+            messageBox("!(#f && ++ n) (doesn't short circuit)", "Success", 0, "");
+        } else {
+            messageBox("!(#f && ++ n) (did short circuit)", "Fail", 1, "");
+        }
+    } else {
+        messageBox("!(#f && ++ n)", "Fail", 1, "");
     }
 }
diff --git a/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.maki b/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.maki
index abdcedf725d7cc6dcb2ab80aae4e077529dd92a2..7f7c3369ec4190bf0b4cbe38949a3f86dd28c92e 100755
GIT binary patch
literal 8698
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

delta 1209
zcmYk4J7`l;7{~8P+oX9kY2ImG_oR8WNt%1^BS~A$qe-J!(80m6f(R~-f`b%_II2kb
zKvWO}7bj^^1i_($qp!uqK?>5vNf*Tj)bD&Zt+~TF|KI<6obO!D@6|1Rd*EOLIN|sR
z&9Nu&VJ!0O<amg|n{hwvIn%?v0%_+9R)dCXusN+Lid(UGjhnp9jS!-TuqL??MV?YD
zt#O#3HR4oZ@(Q;wqnSYTDiRIMYIAFb;!Q3nZYC*iA<_X_BSrBBFG^#K8yUDaIor*W
zYw;4Lnd%TX2rZ82QB2-yaRbk&=ZNdP(;+tV@M|*9ijZ;V^Ya*UDhAKBxmiX%fx5-b
z3Q3b=MHMc(HMRgXkHEjMj;jVgJvtMx?$!MUCb|@(TE&A56W)1Mf1NC|Rzu5dz#ngR
zvq@I9D#tOG5FASG(z3nl$0(S?Sexs|5#&6mjTUL0{Pxf<mAKJC?N)O021nA%-685W
zt_(9bHn`EVwaF3mK7lT^v5H!@AkxbWarC?4hX+${SpayT4B!018^9=Y;BvYL7a|<i
z0>T$Q^m;4;JK-#g!gqf@E+0WcHgr${lcjwYlNs<gP<KU$15}Za6+!tZh7~cCc<iH4
z0nSYe-_fzF_7U)OTCgCT375eY6f7+j%g83a%>O0<IKYIL!IAnkY$^u`g#>IzDsUNh
zceDbpLxRo1PNWQ1!*$q=7U6wZ%$DR79$a(>o0D4J95wmUaKqV95<W$Q=g9JrWkrRD
zDx~j`7OTkda81QExD^#}B~ifFB)tWAmC#@xz1^82zAEWya6T#UZK2Kz>@oZ=I?BU|
zq+Vhry3ga7a8hiJ@JCFjqp6lG8xAk^GPCm@#)ZpfyUn+_m>SL1;ZC{$gM>(rc3YI)
zT)5z`kQ#bw3ce-;oXV)snGtX|Q-m$tZ>ny19!|kN>UOpO%Sqe2pH0DS)L*hi*u#BM
mEwV0My9?J<4OUVDKC1-)+znn}eTwzr8W(Vo5)<-O<^BOdiPtOu

diff --git a/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.m b/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.m
index ab08372f..18f14911 100755
--- a/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.m	
+++ b/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.m	
@@ -16,6 +16,18 @@ System.onScriptLoaded()
         messageBox("2.2 + 2.2 = 4.4", "Fail", 1, "");
     }
 
+    if (sum + sumFloat == sumFloat + sum) {
+        messageBox("4 + 4.4 = 4.4 + 4 (not implict casting)", "Success", 0, "");
+    } else {
+        messageBox("4 + 4.4 = 4.4 + 4 (not implict casting)", "Fail", 1, "");
+    }
+
+    if (true + true == 2) {
+        messageBox("#t + #t = 2", "Success", 0, "");
+    } else {
+        messageBox("#t + #t = 2", "Fail", 1, "");
+    }
+
     if (3 - 2 == 1) {
         messageBox("3 - 2 = 1", "Success", 0, "");
     } else {
@@ -46,6 +58,36 @@ System.onScriptLoaded()
         messageBox("2 * 1.5 = 3", "Fail", 1, "");
     }
 
+    if (true * 3 == 3) {
+        messageBox("#t * 3 = 3", "Success", 0, "");
+    } else {
+        messageBox("#t * 3 = 3", "Fail", 1, "");
+    }
+
+    if (false * 3 == 0) {
+        messageBox("#f * 3 = 0", "Success", 0, "");
+    } else {
+        messageBox("#f * 3 = 0", "Fail", 1, "");
+    }
+
+    if (true * 0.25 == 0.25) {
+        messageBox("#t * 0.25 = 0.25", "Success", 0, "");
+    } else {
+        messageBox("#t * 0.25 = 0.25", "Fail", 1, "");
+    }
+
+    if (0.25 * true == 0.25) {
+        messageBox("0.25 * #t = 0.25", "Success", 0, "");
+    } else {
+        messageBox("0.25 * #t = 0.25", "Fail", 1, "");
+    }
+
+    if (false * 0.25 == 0) {
+        messageBox("#f * 0.25 = 0", "Success", 0, "");
+    } else {
+        messageBox("#f * 0.25 = 0", "Fail", 1, "");
+    }
+
     if (6 / 3 == 2) {
         messageBox("6 / 3 = 2", "Success", 0, "");
     } else {
@@ -132,6 +174,24 @@ System.onScriptLoaded()
         messageBox("[int] 4 = [float] 4.4 (autocasting types)", "Fail", 1, "");
     }
 
+    if (!(sumFloat == sum)) {
+        messageBox("! [float] 4.4 = [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("! [float] 4.4 = [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
+    if (sumFloat != sum) {
+        messageBox("[float] 4.4 != [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("[float] 4.4 != [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
+    if (!(sum != sumFloat)) {
+        messageBox("! [int] 4 != [float] 4.4 (autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("! [int] 4 != [float] 4.4 (autocasting types)", "Fail", 1, "");
+    }
+
     if (sum <= sumFloat) {
         messageBox("[int] 4 <= [float] 4.4 (autocasting types)", "Success", 0, "");
     } else {
@@ -144,18 +204,43 @@ System.onScriptLoaded()
         messageBox("[int] 4 >= [float] 4.4 (autocasting types)", "Fail", 1, "");
     }
 
+    if (!(sumFloat <= sum)) {
+        messageBox("! [float] 4.4 <= [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("! [float] 4.4 <= [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
+    if (sumFloat >= sum) {
+        messageBox("[float] 4.4 >= [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("[float] 4.4 >= [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
+
     if (!(sum < sumFloat)) {
         messageBox("! [int] 4 < [float] 4.4 (autocasting types)", "Success", 0, "");
     } else {
         messageBox("! [int] 4 < [float] 4.4 (autocasting types)", "Fail", 1, "");
     }
 
+    if (!(sumFloat < sum)) {
+        messageBox("! [float] 4.4 < [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("! [float] 4.4 < [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
     if (!(sum > sumFloat)) {
         messageBox("! [int] 4 > [float] 4.4 (autocasting types)", "Success", 0, "");
     } else {
         messageBox("! [int] 4 > [float] 4.4 (autocasting types)", "Fail", 1, "");
     }
 
+    if (sumFloat > sum) {
+        messageBox("[float] 4.4 > [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("[float] 4.4 > [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
     Int tempOne = 1;
     if (tempOne++ == one) {
         messageBox("1++ = 1", "Success", 0, "");
@@ -204,9 +289,9 @@ System.onScriptLoaded()
 
     Boolean f = false;
     if (!f) {
-        messageBox("!f", "Success", 0, "");
+        messageBox("!#f", "Success", 0, "");
     } else {
-        messageBox("!f", "Fail", 1, "");
+        messageBox("!#f", "Fail", 1, "");
     }
 
     if (!0) {
@@ -216,62 +301,83 @@ System.onScriptLoaded()
     }
 
     if (!1 == false) {
-        messageBox("!1 == false", "Success", 0, "");
+        messageBox("!1 == #f", "Success", 0, "");
     } else {
-        messageBox("!1 == false", "Fail", 1, "");
+        messageBox("!1 == #f", "Fail", 1, "");
     }
 
     if (1 == true) {
-        messageBox("1 == true", "Success", 0, "");
+        messageBox("1 == #t", "Success", 0, "");
     } else {
-        messageBox("1 == true", "Fail", 1, "");
+        messageBox("1 == #t", "Fail", 1, "");
     }
 
     if (0 == false) {
-        messageBox("0 == false", "Success", 0, "");
+        messageBox("0 == #f", "Success", 0, "");
     } else {
-        messageBox("0 == false", "Fail", 1, "");
+        messageBox("0 == #f", "Fail", 1, "");
     }
 
     if (true && true) {
-        messageBox("true && true", "Success", 0, "");
+        messageBox("#t && #t", "Success", 0, "");
     } else {
-        messageBox("true && true", "Fail", 1, "");
+        messageBox("#t && #t", "Fail", 1, "");
     }
 
     if (!(true && false)) {
-        messageBox("!(true && false)", "Success", 0, "");
+        messageBox("!(#t && #f)", "Success", 0, "");
     } else {
-        messageBox("!(true && false)", "Fail", 1, "");
+        messageBox("!(#t && #f)", "Fail", 1, "");
     }
 
     if (!(false && false)) {
-        messageBox("!(false && false)", "Success", 0, "");
+        messageBox("!(#f && #f)", "Success", 0, "");
     } else {
-        messageBox("!(false && false)", "Fail", 1, "");
+        messageBox("!(#f && #f)", "Fail", 1, "");
     }
 
     if (true || true) {
-        messageBox("true || true", "Success", 0, "");
+        messageBox("#t || #t", "Success", 0, "");
     } else {
-        messageBox("true || true", "Fail", 1, "");
+        messageBox("#t || #t", "Fail", 1, "");
     }
 
     if (true || false) {
-        messageBox("true || false", "Success", 0, "");
+        messageBox("#t || #f", "Success", 0, "");
     } else {
-        messageBox("true || false", "Fail", 1, "");
+        messageBox("#t || #f", "Fail", 1, "");
     }
 
     if (false || true) {
-        messageBox("false || true", "Success", 0, "");
+        messageBox("#f || #t", "Success", 0, "");
     } else {
-        messageBox("false || true", "Fail", 1, "");
+        messageBox("#f || #t", "Fail", 1, "");
     }
 
     if (!(false || false)) {
-        messageBox("!(false || false)", "Success", 0, "");
+        messageBox("!(#f || #f)", "Success", 0, "");
     } else {
-        messageBox("!(false || false)", "Fail", 1, "");
+        messageBox("!(#f || #f)", "Fail", 1, "");
+    }
+
+    Int n = 1;
+    if (true || ++n) {
+        if (n == 2) {
+            messageBox("#t || ++n (doesn't short circuit)", "Success", 0, "");
+        } else {
+            messageBox("#t || ++n (did short circuit)", "Fail", 1, "");
+        }
+    } else {
+        messageBox("#t || ++n", "Fail", 1, "");
+    }
+
+    if (!(false && ++n)) {
+        if (n == 3) {
+            messageBox("!(#f && ++ n) (doesn't short circuit)", "Success", 0, "");
+        } else {
+            messageBox("!(#f && ++ n) (did short circuit)", "Fail", 1, "");
+        }
+    } else {
+        messageBox("!(#f && ++ n)", "Fail", 1, "");
     }
 }
diff --git a/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.maki b/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.maki
index 8155ba9472df3f0cb7fdcb367c9e545e45c890e0..a08b95b833dcd2cc3ce3f513db9c236cf859ad2d 100755
GIT binary patch
literal 8778
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

delta 1208
zcmYjPOKTHR6rP(t;v{J&O(u`#H8;(pP14MrM^f9GG)-ERVxdcM>%xr+{(wr6qT)hP
zPZeFba3Q#<C<Qkz1s4SuE?lWd5kv(+a4(*7Gp(7$Ip6o4=N-=e>VfrQ$H!LTzV8EE
zA9@CSSl@dv9AS_d83)Us@q867j=o}bxaMEo3M-1DDlV^chqt*MK^l;>PP`dIKBl;4
z^Dx0|CS--ftK7wmxg^q{Le$2rHg_jwe2xnlcTzI$B9#NoW?IIZyhOqfx3lp5*i<Jc
zRhO4#nqzo$Q&N{B4JZz8wYZHl8hObZd}&E?rvPheftBErS}4q5Y*ev%zRjHq;t|9x
z?o=goI9AkPPc_*rTnPyL3%h7dI2E**fZd=qZeyZfv1>IPWIK=x8RHEpIrTb9P7_Xt
za$9p!s?}&6XC8@9$)8{7duve!^B8M$>jV<o2eI9f*phnN)5~RUFCkWy{EW?!S(T1Q
ztv+4$GB-E5-R)zCBe8mtScL5r#MDAEtHO{De%s^lbL<_{;IdYMWlaP%j4~gZ^)9^B
zIXu!tD0--MnGQ_Pu^4o<LV}JUNez9nfKh3W#VG^U!wtVKxh5-;R53wE;Z?*D;@IDj
zB0LR?(9zhH{s{OR7Hk3@M=Nk<La+=WmZc`4?EfYjZ0HqGBLnqo*pwDH7ZLYjRd^i{
za2CBD6>JJvtO9SN4G70eVCZ71OiKjNSUxsQm>!N;>LjS}B$9$^OazXkkd(Gjk`<%}
zNMcpm4()}637=vD-Xx27Or*_1XwrmcTtGNg!lNS1gy$)Nr-e8tu!r|sEQE&}5uRsd
z`J6v-F)CxzlAcTmV=&dFGH-dp3#^~_D<S-S-fy#<6k~(A7JSJRVJ9gvgWZl(H$NKu
z6@=lgk%q-d0S~hV+(!Q`TY>}h9}N|T^)xh70&eAsa1%XgKXPgKjMz0wV5J4zFiNZ=
ipWT7?h6#62GkFodqQA<EtS4hV*yjQ^GGc^|D*q3jamM`s

diff --git a/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.m b/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.m
index ab08372f..18f14911 100755
--- a/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.m	
+++ b/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.m	
@@ -16,6 +16,18 @@ System.onScriptLoaded()
         messageBox("2.2 + 2.2 = 4.4", "Fail", 1, "");
     }
 
+    if (sum + sumFloat == sumFloat + sum) {
+        messageBox("4 + 4.4 = 4.4 + 4 (not implict casting)", "Success", 0, "");
+    } else {
+        messageBox("4 + 4.4 = 4.4 + 4 (not implict casting)", "Fail", 1, "");
+    }
+
+    if (true + true == 2) {
+        messageBox("#t + #t = 2", "Success", 0, "");
+    } else {
+        messageBox("#t + #t = 2", "Fail", 1, "");
+    }
+
     if (3 - 2 == 1) {
         messageBox("3 - 2 = 1", "Success", 0, "");
     } else {
@@ -46,6 +58,36 @@ System.onScriptLoaded()
         messageBox("2 * 1.5 = 3", "Fail", 1, "");
     }
 
+    if (true * 3 == 3) {
+        messageBox("#t * 3 = 3", "Success", 0, "");
+    } else {
+        messageBox("#t * 3 = 3", "Fail", 1, "");
+    }
+
+    if (false * 3 == 0) {
+        messageBox("#f * 3 = 0", "Success", 0, "");
+    } else {
+        messageBox("#f * 3 = 0", "Fail", 1, "");
+    }
+
+    if (true * 0.25 == 0.25) {
+        messageBox("#t * 0.25 = 0.25", "Success", 0, "");
+    } else {
+        messageBox("#t * 0.25 = 0.25", "Fail", 1, "");
+    }
+
+    if (0.25 * true == 0.25) {
+        messageBox("0.25 * #t = 0.25", "Success", 0, "");
+    } else {
+        messageBox("0.25 * #t = 0.25", "Fail", 1, "");
+    }
+
+    if (false * 0.25 == 0) {
+        messageBox("#f * 0.25 = 0", "Success", 0, "");
+    } else {
+        messageBox("#f * 0.25 = 0", "Fail", 1, "");
+    }
+
     if (6 / 3 == 2) {
         messageBox("6 / 3 = 2", "Success", 0, "");
     } else {
@@ -132,6 +174,24 @@ System.onScriptLoaded()
         messageBox("[int] 4 = [float] 4.4 (autocasting types)", "Fail", 1, "");
     }
 
+    if (!(sumFloat == sum)) {
+        messageBox("! [float] 4.4 = [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("! [float] 4.4 = [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
+    if (sumFloat != sum) {
+        messageBox("[float] 4.4 != [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("[float] 4.4 != [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
+    if (!(sum != sumFloat)) {
+        messageBox("! [int] 4 != [float] 4.4 (autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("! [int] 4 != [float] 4.4 (autocasting types)", "Fail", 1, "");
+    }
+
     if (sum <= sumFloat) {
         messageBox("[int] 4 <= [float] 4.4 (autocasting types)", "Success", 0, "");
     } else {
@@ -144,18 +204,43 @@ System.onScriptLoaded()
         messageBox("[int] 4 >= [float] 4.4 (autocasting types)", "Fail", 1, "");
     }
 
+    if (!(sumFloat <= sum)) {
+        messageBox("! [float] 4.4 <= [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("! [float] 4.4 <= [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
+    if (sumFloat >= sum) {
+        messageBox("[float] 4.4 >= [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("[float] 4.4 >= [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
+
     if (!(sum < sumFloat)) {
         messageBox("! [int] 4 < [float] 4.4 (autocasting types)", "Success", 0, "");
     } else {
         messageBox("! [int] 4 < [float] 4.4 (autocasting types)", "Fail", 1, "");
     }
 
+    if (!(sumFloat < sum)) {
+        messageBox("! [float] 4.4 < [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("! [float] 4.4 < [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
     if (!(sum > sumFloat)) {
         messageBox("! [int] 4 > [float] 4.4 (autocasting types)", "Success", 0, "");
     } else {
         messageBox("! [int] 4 > [float] 4.4 (autocasting types)", "Fail", 1, "");
     }
 
+    if (sumFloat > sum) {
+        messageBox("[float] 4.4 > [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("[float] 4.4 > [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
     Int tempOne = 1;
     if (tempOne++ == one) {
         messageBox("1++ = 1", "Success", 0, "");
@@ -204,9 +289,9 @@ System.onScriptLoaded()
 
     Boolean f = false;
     if (!f) {
-        messageBox("!f", "Success", 0, "");
+        messageBox("!#f", "Success", 0, "");
     } else {
-        messageBox("!f", "Fail", 1, "");
+        messageBox("!#f", "Fail", 1, "");
     }
 
     if (!0) {
@@ -216,62 +301,83 @@ System.onScriptLoaded()
     }
 
     if (!1 == false) {
-        messageBox("!1 == false", "Success", 0, "");
+        messageBox("!1 == #f", "Success", 0, "");
     } else {
-        messageBox("!1 == false", "Fail", 1, "");
+        messageBox("!1 == #f", "Fail", 1, "");
     }
 
     if (1 == true) {
-        messageBox("1 == true", "Success", 0, "");
+        messageBox("1 == #t", "Success", 0, "");
     } else {
-        messageBox("1 == true", "Fail", 1, "");
+        messageBox("1 == #t", "Fail", 1, "");
     }
 
     if (0 == false) {
-        messageBox("0 == false", "Success", 0, "");
+        messageBox("0 == #f", "Success", 0, "");
     } else {
-        messageBox("0 == false", "Fail", 1, "");
+        messageBox("0 == #f", "Fail", 1, "");
     }
 
     if (true && true) {
-        messageBox("true && true", "Success", 0, "");
+        messageBox("#t && #t", "Success", 0, "");
     } else {
-        messageBox("true && true", "Fail", 1, "");
+        messageBox("#t && #t", "Fail", 1, "");
     }
 
     if (!(true && false)) {
-        messageBox("!(true && false)", "Success", 0, "");
+        messageBox("!(#t && #f)", "Success", 0, "");
     } else {
-        messageBox("!(true && false)", "Fail", 1, "");
+        messageBox("!(#t && #f)", "Fail", 1, "");
     }
 
     if (!(false && false)) {
-        messageBox("!(false && false)", "Success", 0, "");
+        messageBox("!(#f && #f)", "Success", 0, "");
     } else {
-        messageBox("!(false && false)", "Fail", 1, "");
+        messageBox("!(#f && #f)", "Fail", 1, "");
     }
 
     if (true || true) {
-        messageBox("true || true", "Success", 0, "");
+        messageBox("#t || #t", "Success", 0, "");
     } else {
-        messageBox("true || true", "Fail", 1, "");
+        messageBox("#t || #t", "Fail", 1, "");
     }
 
     if (true || false) {
-        messageBox("true || false", "Success", 0, "");
+        messageBox("#t || #f", "Success", 0, "");
     } else {
-        messageBox("true || false", "Fail", 1, "");
+        messageBox("#t || #f", "Fail", 1, "");
     }
 
     if (false || true) {
-        messageBox("false || true", "Success", 0, "");
+        messageBox("#f || #t", "Success", 0, "");
     } else {
-        messageBox("false || true", "Fail", 1, "");
+        messageBox("#f || #t", "Fail", 1, "");
     }
 
     if (!(false || false)) {
-        messageBox("!(false || false)", "Success", 0, "");
+        messageBox("!(#f || #f)", "Success", 0, "");
     } else {
-        messageBox("!(false || false)", "Fail", 1, "");
+        messageBox("!(#f || #f)", "Fail", 1, "");
+    }
+
+    Int n = 1;
+    if (true || ++n) {
+        if (n == 2) {
+            messageBox("#t || ++n (doesn't short circuit)", "Success", 0, "");
+        } else {
+            messageBox("#t || ++n (did short circuit)", "Fail", 1, "");
+        }
+    } else {
+        messageBox("#t || ++n", "Fail", 1, "");
+    }
+
+    if (!(false && ++n)) {
+        if (n == 3) {
+            messageBox("!(#f && ++ n) (doesn't short circuit)", "Success", 0, "");
+        } else {
+            messageBox("!(#f && ++ n) (did short circuit)", "Fail", 1, "");
+        }
+    } else {
+        messageBox("!(#f && ++ n)", "Fail", 1, "");
     }
 }
diff --git a/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.maki b/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.maki
index 6ee8793ca3f2fd398cb1f798bfc1b8aa8cba7cbc..02905f688e2d2c22ec64099d9101e9736ce8dc16 100755
GIT binary patch
delta 2525
zcmah}OK)366u#pmPW(!oxQU-l#&PqwaqQUFc5YIfH0c9q(zNL#ZAqH8A&J3K>y+eH
zs8S`v0wI9}i&F^+)D41ts|vvu2{yojAHael!3ro6E0Ca^bH;XWT8UV?$LIUz`_7!1
zduQ&9zcqjFTZg#%;5&yd;82r<znVUQ$IVX18`JQnbD7cy_nW%}oN~SlzqO3u^E*Bh
zu+=gmj=~Sl_p05RrVVL%nUwi-UQThuTn<;ZELpyO<63#$lIv?bR=M(u-h*O~matHb
zVM-byBwSifrlf%|8$sx1m?B)*kJzW>(uKMpUFc(nAxC5m72{Qj*rO57qHId$;z+n@
z4yDNTD_pAK%mKuHHJ(WuWTC$SW|<gKy-_}htWQgjx2_#R%B79VF`nOu4<q(q%VTN<
z>4MIJf*epp5`Jy%KQzi@P7X3@q-yXs!(1AnTQg*_D6`m4evENmPERv7varyW5IK0Q
zEs+?<F{hT5aojx<^A^mD(wN}Xkm#6%&)d?~gGh{Nak)~uwzX!h*51xaxk9;mJ8L(s
zt=gNB)~y?xJNk2IN^5otPP2!nh@MfJs8*UBrEBo6D<-Dkm$or64Lz>0>LHY6p6aK#
zXYrY58k*kIGmD<2t)U|Kv+RnEAI6cV_XJ1(e@~9U>#oe~QM9IZ?acIE#^=$}s%4W&
ze5KhJ;4@cW^*B>TDut9WhajvG7+xz`o7-|@bA5aB`ewz_$uZB`WRkuJV*x>v7EhE;
zV&c%^nN#@Rrp0k^N+wE+tX04|%^;&j&ae(o!{DGyRIRfJJz9LYMwIk(b)v+IlD<?o
z+`f(H;Jh7`E+|xzJa+Mkm2gR4Mj}op3t=)@k;5BXn>&>uOYXe7wT+iRxw^f6vux=r
zsN26wSKer7l;jdhTu&sc2nVQb?h<#jqCZ<*IWKb)PfOJV8SX;quAt7hyQDyhehz$Y
z;PX|_gZu7P0e1r~?~Ld|MtCvIz^pGSy5V8_5XEo+z7IAx%?J;ywfDk=*AzkM@apiP
z*YpL+<iT)aR)lF>M93GVi!Ma-HEWL_J4CcDn-wvxa>-Y0CGTO;%ec4Q^imlSV={>3
z5<CjG)I@}P;YSp?Nu-=^B1J#<i7^~#O|Ut^;*UE_FJaMaBb)rS3QEZpU<1kCdf6kj
zWqyrhV{u1R*J7CF^3#oITU!`H9Xbql79rL#0B?8F_T1{w#VBtCU5qwyqvUZ^QTr)w
zKLw-y3HZCygpd3qu+(LW4E*EQ!4oir0hc><_%dMj=c!3rPR1b$l+%u3&O8w=c<7CY
zaVi<6d(<{@L*pe4JltoxxdicUri$GreF^YKS5!<=iOA&c5{(a}ZH^81x=nY3<Eg>h
z!!;Z(rLYu)`9Ku!N-T--{eS^K^_ZT9)2Fl(L0dHsPjDxwIuiS0@F-|Hl?DC{^ub(6
z4XxtPry-kDtwn^*z%lH;zFU+}h&+E7UxZC3j};gOB4(dm`XbqC8%z15P`Ym-W~;(n
zMqt<NLovGJY`bhXAA`l717e<Jqw~9E_W4fGeDqc0i=>=)LoD!aEr2JO5+^x732VWe
zIK??eK9zl9k?|sgLWVfaIYxD2;hj)aoM8@QI0!$7V&W|0voI3QiF2G|tm*HDqhg6U
zjA28Z=lnbrBZj!Z`33kOk`osxH|Tb>t^6fgM(x|AKS9L7)BdaVT%9Yi%!O7c4$&oO
ZE5S#bZHsd@pE@V2?7PhI3j7&~{|5sy6rlhB

delta 1325
zcmZ8g%TE(Q7~d%`TZ*(mS=w#4v)vYHYs>Cz%lK%EJO%Zt2OsejOpFng^xy%5nrJ*}
z;^)nqClh1T5RDhZAD}l+96f71>CK4Wd|RPPvOB-meBU?Q;oi|F6R$r8*pc;5fjom~
z=W}?~F|eNQ8e*`~UBKr%b0D(o;o7jKX+h27B`$cKyCX<LL`#ZS4di{ASFZjIl&dM)
zA$Wm%n3yn;_G*f{n5uIxP5uNQCtq;#J*3p2T(!ur@|+SnxNF0QU}iE)s>equCUPyh
zO4J)g8qx%>)wqj2Dtm}mc%wmF<iQNttO(N~+b*Nmt-0K)b1{y%3vrDLhoIoN!-WT-
za=$>Kpq;wB+&sf8yarCM)$jeIHI&9GkPJJl3U|ZKL5Y5k<`#=Mgu4$(g2>qUOU<Pf
zetG%g%F@-PrR8QGeQ|)oqEu4kAn-nOtwvI@s16|-NCKL5Y0_VvLu6X$)wwf;M4bY$
zJ5AUjeWs<4j&gSvaZt0yT#n4i&$X!I)A?3%b(On^eJnT<XMu>Lu)DauM>%<hRQ(0;
zxsK2I$oj_aGb|iK%zE)P#X5oMCcKQuzHRZ?6w^uF9hKquPBfuJX26Z;p18V5BdUC-
zwzU<YT1*v~hBwjEJqd+ajPfSs)wOENCy`Qq2F~dm#DLtHX@*fF02FnVQ-jX72K|9z
z=0B0y)WSx&t;P0n7O2I$!L}BQ{%oKRN%%QjfSb6U&<n6RB-t3e*Yof+R)f??4t~X?
zxmWe;#FrCbrN6xqlU{<e2@}$~4EYrOFx-hH;5JH>R(eQD_%Di|4&T?3I=qM*@I{w!
zD;b2iVK70SAg^f{Fg>EY99~zor$TxomBfpSJX6J*ZD*ZOQ?({kcpuwKKVT#-yU8mN
zy%Lw{_UL}KO?_QFjKcewpUWg<kI(%ww-Peio>est&{y3|$as6jx~drRE7l)#6CN27
zj`K8p#q|Zx!F*D}2P+5>%YbKyFIZXlO<ERCrX&>YAXu3syhYs1<k%b?e-2(*I&5YP
bNSP{=g`2qEx3g@4`~~=Id+-glmE7PTd${89

diff --git a/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.m b/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.m
index ab08372f..18f14911 100755
--- a/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.m	
+++ b/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.m	
@@ -16,6 +16,18 @@ System.onScriptLoaded()
         messageBox("2.2 + 2.2 = 4.4", "Fail", 1, "");
     }
 
+    if (sum + sumFloat == sumFloat + sum) {
+        messageBox("4 + 4.4 = 4.4 + 4 (not implict casting)", "Success", 0, "");
+    } else {
+        messageBox("4 + 4.4 = 4.4 + 4 (not implict casting)", "Fail", 1, "");
+    }
+
+    if (true + true == 2) {
+        messageBox("#t + #t = 2", "Success", 0, "");
+    } else {
+        messageBox("#t + #t = 2", "Fail", 1, "");
+    }
+
     if (3 - 2 == 1) {
         messageBox("3 - 2 = 1", "Success", 0, "");
     } else {
@@ -46,6 +58,36 @@ System.onScriptLoaded()
         messageBox("2 * 1.5 = 3", "Fail", 1, "");
     }
 
+    if (true * 3 == 3) {
+        messageBox("#t * 3 = 3", "Success", 0, "");
+    } else {
+        messageBox("#t * 3 = 3", "Fail", 1, "");
+    }
+
+    if (false * 3 == 0) {
+        messageBox("#f * 3 = 0", "Success", 0, "");
+    } else {
+        messageBox("#f * 3 = 0", "Fail", 1, "");
+    }
+
+    if (true * 0.25 == 0.25) {
+        messageBox("#t * 0.25 = 0.25", "Success", 0, "");
+    } else {
+        messageBox("#t * 0.25 = 0.25", "Fail", 1, "");
+    }
+
+    if (0.25 * true == 0.25) {
+        messageBox("0.25 * #t = 0.25", "Success", 0, "");
+    } else {
+        messageBox("0.25 * #t = 0.25", "Fail", 1, "");
+    }
+
+    if (false * 0.25 == 0) {
+        messageBox("#f * 0.25 = 0", "Success", 0, "");
+    } else {
+        messageBox("#f * 0.25 = 0", "Fail", 1, "");
+    }
+
     if (6 / 3 == 2) {
         messageBox("6 / 3 = 2", "Success", 0, "");
     } else {
@@ -132,6 +174,24 @@ System.onScriptLoaded()
         messageBox("[int] 4 = [float] 4.4 (autocasting types)", "Fail", 1, "");
     }
 
+    if (!(sumFloat == sum)) {
+        messageBox("! [float] 4.4 = [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("! [float] 4.4 = [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
+    if (sumFloat != sum) {
+        messageBox("[float] 4.4 != [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("[float] 4.4 != [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
+    if (!(sum != sumFloat)) {
+        messageBox("! [int] 4 != [float] 4.4 (autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("! [int] 4 != [float] 4.4 (autocasting types)", "Fail", 1, "");
+    }
+
     if (sum <= sumFloat) {
         messageBox("[int] 4 <= [float] 4.4 (autocasting types)", "Success", 0, "");
     } else {
@@ -144,18 +204,43 @@ System.onScriptLoaded()
         messageBox("[int] 4 >= [float] 4.4 (autocasting types)", "Fail", 1, "");
     }
 
+    if (!(sumFloat <= sum)) {
+        messageBox("! [float] 4.4 <= [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("! [float] 4.4 <= [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
+    if (sumFloat >= sum) {
+        messageBox("[float] 4.4 >= [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("[float] 4.4 >= [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
+
     if (!(sum < sumFloat)) {
         messageBox("! [int] 4 < [float] 4.4 (autocasting types)", "Success", 0, "");
     } else {
         messageBox("! [int] 4 < [float] 4.4 (autocasting types)", "Fail", 1, "");
     }
 
+    if (!(sumFloat < sum)) {
+        messageBox("! [float] 4.4 < [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("! [float] 4.4 < [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
     if (!(sum > sumFloat)) {
         messageBox("! [int] 4 > [float] 4.4 (autocasting types)", "Success", 0, "");
     } else {
         messageBox("! [int] 4 > [float] 4.4 (autocasting types)", "Fail", 1, "");
     }
 
+    if (sumFloat > sum) {
+        messageBox("[float] 4.4 > [int] 4 (not autocasting types)", "Success", 0, "");
+    } else {
+        messageBox("[float] 4.4 > [int] 4 (not autocasting types)", "Fail", 1, "");
+    }
+
     Int tempOne = 1;
     if (tempOne++ == one) {
         messageBox("1++ = 1", "Success", 0, "");
@@ -204,9 +289,9 @@ System.onScriptLoaded()
 
     Boolean f = false;
     if (!f) {
-        messageBox("!f", "Success", 0, "");
+        messageBox("!#f", "Success", 0, "");
     } else {
-        messageBox("!f", "Fail", 1, "");
+        messageBox("!#f", "Fail", 1, "");
     }
 
     if (!0) {
@@ -216,62 +301,83 @@ System.onScriptLoaded()
     }
 
     if (!1 == false) {
-        messageBox("!1 == false", "Success", 0, "");
+        messageBox("!1 == #f", "Success", 0, "");
     } else {
-        messageBox("!1 == false", "Fail", 1, "");
+        messageBox("!1 == #f", "Fail", 1, "");
     }
 
     if (1 == true) {
-        messageBox("1 == true", "Success", 0, "");
+        messageBox("1 == #t", "Success", 0, "");
     } else {
-        messageBox("1 == true", "Fail", 1, "");
+        messageBox("1 == #t", "Fail", 1, "");
     }
 
     if (0 == false) {
-        messageBox("0 == false", "Success", 0, "");
+        messageBox("0 == #f", "Success", 0, "");
     } else {
-        messageBox("0 == false", "Fail", 1, "");
+        messageBox("0 == #f", "Fail", 1, "");
     }
 
     if (true && true) {
-        messageBox("true && true", "Success", 0, "");
+        messageBox("#t && #t", "Success", 0, "");
     } else {
-        messageBox("true && true", "Fail", 1, "");
+        messageBox("#t && #t", "Fail", 1, "");
     }
 
     if (!(true && false)) {
-        messageBox("!(true && false)", "Success", 0, "");
+        messageBox("!(#t && #f)", "Success", 0, "");
     } else {
-        messageBox("!(true && false)", "Fail", 1, "");
+        messageBox("!(#t && #f)", "Fail", 1, "");
     }
 
     if (!(false && false)) {
-        messageBox("!(false && false)", "Success", 0, "");
+        messageBox("!(#f && #f)", "Success", 0, "");
     } else {
-        messageBox("!(false && false)", "Fail", 1, "");
+        messageBox("!(#f && #f)", "Fail", 1, "");
     }
 
     if (true || true) {
-        messageBox("true || true", "Success", 0, "");
+        messageBox("#t || #t", "Success", 0, "");
     } else {
-        messageBox("true || true", "Fail", 1, "");
+        messageBox("#t || #t", "Fail", 1, "");
     }
 
     if (true || false) {
-        messageBox("true || false", "Success", 0, "");
+        messageBox("#t || #f", "Success", 0, "");
     } else {
-        messageBox("true || false", "Fail", 1, "");
+        messageBox("#t || #f", "Fail", 1, "");
     }
 
     if (false || true) {
-        messageBox("false || true", "Success", 0, "");
+        messageBox("#f || #t", "Success", 0, "");
     } else {
-        messageBox("false || true", "Fail", 1, "");
+        messageBox("#f || #t", "Fail", 1, "");
     }
 
     if (!(false || false)) {
-        messageBox("!(false || false)", "Success", 0, "");
+        messageBox("!(#f || #f)", "Success", 0, "");
     } else {
-        messageBox("!(false || false)", "Fail", 1, "");
+        messageBox("!(#f || #f)", "Fail", 1, "");
+    }
+
+    Int n = 1;
+    if (true || ++n) {
+        if (n == 2) {
+            messageBox("#t || ++n (doesn't short circuit)", "Success", 0, "");
+        } else {
+            messageBox("#t || ++n (did short circuit)", "Fail", 1, "");
+        }
+    } else {
+        messageBox("#t || ++n", "Fail", 1, "");
+    }
+
+    if (!(false && ++n)) {
+        if (n == 3) {
+            messageBox("!(#f && ++ n) (doesn't short circuit)", "Success", 0, "");
+        } else {
+            messageBox("!(#f && ++ n) (did short circuit)", "Fail", 1, "");
+        }
+    } else {
+        messageBox("!(#f && ++ n)", "Fail", 1, "");
     }
 }
diff --git a/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.maki b/experiments/modern/src/maki-interpreter/reference/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.maki
index 9f9a679f64460913e3371d5acfa844fadd992a4f..cef42814e94aa4ba44146bd4eaf0e9823f89666d 100755
GIT binary patch
delta 2493
zcmah}O>7%Q6y8Z1CwAi0&cB_+9mjE+wQH|uZKrMOq)D0<`U5m=lQv1y;wIi=DRrvE
z6+$X9NaO?@$h#rItrDV0tyE52Doz}sCr~AXgg9_2;>H09-h1nH-Bb`uo_*gp-}l~|
z+1dH=@ULed1{%f9N5RGq1^m%C0QdHN0S}s74ew2YYF?u7QNF1|z(1}V@R=)y|7Z9=
zg4&ok1s^qkRT<DU?Vy&CahXYG<OGix%hA$CSr%{IUN5ee<!XMbTrAzx2T|OrMarng
zVM3Y*kZ@~hnUE$z6-MY`m>`@TM(own$*dztW=Ggz%9u=}VytoyajQmHp=?5?M>z+k
zw-ssK##R-l;)s3JLrkWUCRyllh*>6Lc5f6Xko9U2^47FSxwSEAaD6juAa2E$4SNO2
zY>EY08MO%$zG)dco@O#FN0>A-Rd|<SI*ZVwnKGA?3j4{7G0w=zNyg?8=yylNI2?CJ
zA`>|0(v%G2?oDFcgmF%q$2l}5I;LRTovchFVQ68wY^`tP%PZBlvs^4uY`>lSo$^NY
z&B*dQw+mbP44RT!y#>qc;W>exLsY1mnjF?TEP4jSEPU-Y#7X$gZB$O7EVZkj+@8r_
zd8whvJw30YCtlZ3j{6z)42+$|ncaJWv;V&*XW*nKRXU5-#0xt!xtH-Zv@~lf9>-Uz
zUPlmQFq*f@g-uy3t!@@>6$+)Yj`QYu7MqC#fjM~S2~{pI6_3-AFfSo!)WQ*K9)kug
zoLazVix$So2^q02v(^UXD-2Th%p&XXxQ~qBxn4rls)a|Z*wU9B!eW7?Uv>1AyLZvB
z;y^;yH5*xy=dM5Z@~oamB21qa!g#zSN7ptATcv|#x%Jk@Cf)+Y&DA@_vVH?)gD=R6
zYr7<?npVNjtd?pGEm7*5+r%v`>Hn3zz)kFyzEr_NnfJwv0x9}6<Nu=AheOY!N^7Q}
zyAuf!z+s9<L3j%0{QY78gm1Wq?!enkIP7Z>E`0DX1%LV^{Onb2A)+vyHZ5H6q&);j
z+m*LQo|_huSP|x2VbnRfhH6ImzI~yYEHfg?Demo8ZIn_(m<$oQ<5O*1-WD<k%Sg76
z&?Z~Bluo7k=w@_Eu`kBCVqC!QS8arOEi=L<*OBC8wvv;<cYfuHas_yQ|1b=7C{Jy1
zC$MoT3@YcPo6;#K;bWf;?{<vAC%!2B)S*NOe)s7j&5hA*=_qTdPNRgjDMJz*cl=p6
z*{R?!e+)kDRN^pv?$=?qONpcKphJgeU25o<vw&2C$WcsNhB5O*xIuV>VuDik(9P;p
ztqIyl0DpHY7yFOFlg<##^(c^C!(xhjy;F5QIwX8NTF$WXagXxUI4%a=y{ff#pxn0X
z?Op|UFySn(Z5AGP8So40YF4kUGy0Uv=HQ2}5N!7;IM5x1r+szOwyHFMDRJ(DK+Qs}
zKMknPbJQfgaNG%sj|f~A9?R{Za`9Y_;nScxP%nLhY}E~<_^7aT+x@E9#+*jX(IN)t
zP~q%my^}JI)2AUWkS<EMoTIC+b`g0&XAPUY2;cUG#3j;u=^}LWEzHmJrp?2AUrH=+
zya4z63~`y`%R2!>T;cEv%wxRB@gjT~NQotmmv(|FvCQEzECda4mE)^$ALA8{S9bah
zagD=kJAp1J_78~b1QT=#I{mzfv9q!KK@l-N=c8L!P|WMjbDA484&yynbMuEqs`2w@
So?EJ?evM599xb@vf9PMkeBdYm

delta 1216
zcmYjPyKhoa7{7<oQeL&Clv1AO0v8Kc;GTPdmKLaeXkRF8Od1EHn~76(G-)ilna06<
zvt8@pV8W!6`~`09;AWgm)1`}}-*+xFklgeA9^d1f!}+~?vG8?ngza}DBPR@c&d>17
z8R-5T4Kg@%<?*{>Cj1!xavWC_#jRMpz)jxZB8k)^X@Phph1{=L#mXR|Sjor=ljpgG
z8C4CbS0O4etHG_T^sBriee<^TEu?Zlu`)0H3fD*&;UW(wp45siRf}h3nt7*Bk0iAU
zNIi<l>vb-0M!6_?nKzq~n+9BZ(s-gtZ#rE;Z%h$fZE&-ScocD+n+p<}94i*#z*}TB
z;Jy-Df<0W9;jhnNb=dP86HQEXDMHtAkXV79KRK}~C9_aK$y|dgf8uyuO1e(lG4CO9
zDC+b3b~HAnsiN25#ugIV4`Q(`u_5)HzMjo;v5VNPsPlp&GjgpyHEjBzpLuk|#X}pL
z9Es7E#2_s8ZfeNMF{Jc!;r9s1!DRQtt+Io~;7uS0t$^^x&|ywoTC30waySbJA0KF|
zOojbmf~DZ&R3=2P;N>VTPKT^uRJ#VRLL8n>S6wPG>`Vn36@=+g3<}bSWx+agQVM*V
z7QUO|>-HcB1_et%Vm1edh;oEjo_hK7L%m|~8Z)$+p$6ObVCc*UD2DU!3*&o?)sSE%
zD1~!y8LGm@oCce-B4yEL#&9tltW20L0I}3ba6@k<0*}MOb0hhr)I~{FknSOgEztgO
z-H!#~dn5`Ia{`{k+%Or7;_D)>hF%F?kRI3Ym65hA^QRIqd~e8;b?i5|s|Mo1_6RRB
zOJ12C5o6LTOWKKu<Z$X;D(jzwaE;k{dQ`Y<Znx<~#We9jF7;UI|10NF5g+ckL3!i2
z;O!9Jk+;x^3HZm8aE@_H)j*F6I8`(77UMO>3yfQ-3=|RqKBY8xhw(b4v6eh~3!3Q?
b{6XzBoq<{sy>y1PrPqc=#(*=_dYbwl=@!#Y

diff --git a/experiments/modern/src/maki-interpreter/virtualMachine.js b/experiments/modern/src/maki-interpreter/virtualMachine.js
index 8fa51627..f2dbfebf 100644
--- a/experiments/modern/src/maki-interpreter/virtualMachine.js
+++ b/experiments/modern/src/maki-interpreter/virtualMachine.js
@@ -1,12 +1,6 @@
 const Variable = require("./variable");
 
 function coerceTypes (var1, var2, val1, val2) {
-  if (var1.type === 'INT') {
-    if (var2.type === 'FLOAT' || var2.type === 'DOUBLE') {
-      return [val1, Math.floor(val2)];
-    }
-  }
-
   if (var2.type === 'INT') {
     if (var1.type === 'FLOAT' || var1.type === 'DOUBLE') {
       return [Math.floor(val1), val2];