pass continuations as arguments, use normal stack

test/Gyehoek/Test/Stack/VM.hs

@@ -14,58 +14,58 @@ evalsTo rs p = Sut.eval p @?= rs
 test_root = testGroup "stack machine"
   [ testCase "lit int" do
       evalsTo [ObjImm (ImmInt 3)] [stkP|
-        (define ($main)
-          (pop-cont! %ktail)
+        (define ($start %ktail)
           (tail-call %ktail 3))
       |]
   , testCase "return constant" do
       evalsTo [ObjImm (ImmInt 123)] [stkP|
-        (define ($main)
-          (tail-call $silly))
-        (define ($silly)
-          (pop-cont! %ktail)
+        (define ($start %ktail)
+          (tail-call $silly %ktail))
+        (define ($silly %ktail)
           (tail-call %ktail 123))
       |]
+  , testCase "identity continuation" do
+      evalsTo [ObjImm (ImmInt 45)] [stkP|
+        (define ($start %ktail)
+          (push! %ktail)
+          (tail-call $id 45))
+        (define ($id %x)
+          (pop! %ktail)
+          (tail-call %ktail %x))
+      |]
   , testCase "identity function" do
       evalsTo [ObjImm (ImmInt 45)] [stkP|
-        (define ($main)
-          (tail-call $id 45))
-        (define ($id %x)
-          (pop-cont! %ktail)
+        (define ($start %ktail)
+          (tail-call $id 45 %ktail))
+        (define ($id %x %ktail)
           (tail-call %ktail %x))
       |]
-  -- , testCase "square" do
-  --     evalsTo [ObjImm (ImmInt 16)] [stkP|
-  --       (define ($main))
-  --     |]
   , testCase "square" do
       evalsTo [ObjImm (ImmInt 16)] [stkP|
-        (define ($main)
-          (tail-call $square 4))
-        (define ($square %x)
+        (define ($start %ktail)
+          (tail-call $square 4 %ktail))
+        (define ($square %x %ktail)
           (prim %x2 (* %x %x))
-          (pop-cont! %ktail)
           (tail-call %ktail %x2))
       |]
   , testCase "factorial" do
       let hsfac (n :: Int) = foldr (*) (1) [1..n]
       let fac (n :: Int) = [stkP|
-            (define ($fac %n)
+            (define ($fac %n %ktail)
               (prim %x0 (zero? %n))
               (if %x0
-                (then (pop-cont! %ktail)
-                      (tail-call %ktail 1))
+                (then (tail-call %ktail 1))
                 (else (push! %n)
+                      (push! %ktail)
                       (prim %x1 (- %n 1))
-                      (push-cont! $fac-k0)
-                      (tail-call $fac %x1))))
+                      (tail-call $fac %x1 $fac-k0))))
             (define ($fac-k0 %x2)
+              (pop! %ktail)
               (pop! %n)
               (prim %x3 (* %x2 %n))
-              (pop-cont! %ktail)
               (tail-call %ktail %x3))
-            (define ($main)
-              (tail-call $fac #{n}))
+            (define ($start %ktail)
+              (tail-call $fac #{n} %ktail))
           |]
       evalsTo [ObjImm (ImmInt 1)] $ fac 0
       evalsTo [ObjImm (ImmInt 1)] $ fac 1