Close #5

kiss/src/kiss/Macros.hx

@@ -567,13 +567,15 @@ class Macros {
             var bindingList = exps[0].bindingList("ifLet");
             var firstPattern = bindingList.shift();
             var firstValue = bindingList.shift();
+            var firstValueSymbol = b.symbol();
 
-            return b.call(
+            return b.callSymbol("let", [
-                b.symbol("if"), [
+                b.list([firstValueSymbol, firstValue]),
-                    firstValue,
+                b.callSymbol("if", [
+                    firstValueSymbol,
                     b.call(
                         b.symbol("case"), [
-                            firstValue,
+                            firstValueSymbol,
                             b.call(
                                 firstPattern, [
                                     if (bindingList.length == 0) {
@@ -590,6 +592,7 @@ class Macros {
                                 ])
                         ]),
                     elseExp
+                ])
             ]);
         }
 
@@ -598,8 +601,7 @@ class Macros {
         macros["whenLet"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
             wholeExp.checkNumArgs(2, null, "(whenLet [[enum bindings...]] [body...])");
             var b = wholeExp.expBuilder();
-            b.call(
+            b.callSymbol("ifLet", [
-                b.symbol("ifLet"), [
                 exps[0],
                 b.begin(exps.slice(1)),
                 b.symbol("null")
@@ -609,8 +611,7 @@ class Macros {
         macros["unlessLet"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
             wholeExp.checkNumArgs(2, null, "(unlessLet [[enum bindings...]] [body...])");
             var b = wholeExp.expBuilder();
-            b.call(
+            b.callSymbol("ifLet", [
-                b.symbol("ifLet"), [
                 exps[0],
                 b.symbol("null"),
                 b.begin(exps.slice(1))

kiss/src/test/cases/BasicTestCase.kiss

@@ -459,7 +459,13 @@
             (Assert.fail))
         (unlessLet [(Some (or 5 6)) some5]
             (print "something else went wrong!")
-            (Assert.fail))))
+            (Assert.fail))
+            
+        // Don't double evaluate the expression:    
+        (let [&mut v 1]
+            (unlessLet [2 (begin (+= v 1) v)]
+                (Assert.fail))
+            (Assert.equals 2 v))))
 
 (defun _testRawString []
     (Assert.equals #| "\\" |# #"\"#)