(macroDepth) and generativetestcase depth limit

kiss/src/kiss/Helpers.hx

@@ -337,6 +337,7 @@ class Helpers {
             }
             // This is kind of a big deal:
             interp.variables.set("eval", Helpers.runAtCompileTimeDynamic.bind(_, k));
+            interp.variables.set("macroDepth", () -> interps.length);
 
             interps.push(interp);
         } else {

kiss/src/test/cases/GenerativeTestCase.kiss

@@ -1,6 +1,7 @@
 (defMacroVar maxInt 1000000000)
 (defMacroVar maxStringLength 20)
 (defMacroVar maxExps 4)
+(defMacroVar maxDepth 15)
 
 (defMacroFunction _macroList [func length]
     (for _ (range length) (func)))
@@ -22,37 +23,46 @@
 
 (defMacroFunction _randomFalsyExp []
     ((chooseRandom
+        (concat
             [
                 ->{`null}
                 ->{`false}
                 ->{`""}
                 ->{`[]}
+            ]
+            (if (< (macroDepth) maxDepth)
+                    [
                         ->{`(or ,@(_randomLengthMacroList _randomFalsyExp))}
                         ->{`(and
                                 ,@(_randomLengthMacroList _randomUncertainExp)
                                 ,(_randomFalsyExp)
                                 ,@(_randomLengthMacroList _randomUncertainExp))}
-        ])))
+                    ]
+                [])))))
 (defMacro randomFalsyExp []
     (printExp (_randomFalsyExp) "Falsy"))
 
 (defMacroFunction _randomTruthyExp []
     ((chooseRandom
+        (concat
             [
                 ->{`true}
                 ->(_randomLetterString)
                 ->(_randomInt)
                 ->(_randomFloat)
-            // These cause stack overflows because it's hard to implement a recursion limit at macro time
-            /*->{`[,@(_randomLengthMacroList _randomLetterString)]}
+            ]
+            (if (< (macroDepth) maxDepth)
+                    [
+                        ->{`[,@(_randomLengthMacroList _randomLetterString)]}
                         ->{`[,@(_randomLengthMacroList _randomInt)]}
                         ->{`[,@(_randomLengthMacroList _randomFloat)]}
                         ->{`(and ,@(_randomLengthMacroList _randomTruthyExp))}
                         ->{`(or 
                                 ,@(_randomLengthMacroList _randomUncertainExp)
                                 ,(_randomTruthyExp)
-                    ,@(_randomLengthMacroList _randomUncertainExp))}*/
-        ])))
+                                ,@(_randomLengthMacroList _randomUncertainExp))}
+                    ]
+                [])))))
 (defMacro randomTruthyExp []
     (printExp (_randomTruthyExp) "Truthy"))