From: Tim Vaughan <tgvaughan@gmail.com>
Date: Wed, 1 Aug 2018 14:40:04 +0000 (+0200)
Subject: call/cc seems to be working!
X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=commitdiff_plain;h=f1f104259426dc77ec46ae1ac3bda65fcc19a034;p=scheme.forth.jl.git

call/cc seems to be working!
---

diff --git a/src/scheme-primitives.4th b/src/scheme-primitives.4th
index f6bb92d..a9b4741 100644
--- a/src/scheme-primitives.4th
+++ b/src/scheme-primitives.4th
@@ -607,9 +607,17 @@ defer display
     2swap apply
 ; make-primitive apply 
 
-:noname ( args -- result )
-  make-continuation nil cons
-  2swap apply
+:noname ( proc -- result )
+    make-continuation
+
+    drop if
+        nil cons
+        2swap apply
+    else
+        2swap 2drop
+    then
+
+    trace
 
 ; 1 make-fa-primitive call-with-current-continuation
 
diff --git a/src/scheme.4th b/src/scheme.4th
index 36a8106..9d64667 100644
--- a/src/scheme.4th
+++ b/src/scheme.4th
@@ -551,11 +551,16 @@ global-env obj!
   depth 2- 2/ fixnum-type 2swap cons
 ;
 
-: make-continuation
+: make-continuation ( -- continuation true-obj )
+    \ true-obj allows calling code to detect whether
+    \ it is being called immediately following make-continuation
+    \ or by a restore-continuation.
 
   cons-param-stack
   cons-return-stack
   cons drop continuation-type
+
+  true boolean-type
 ;
 
 : continuation->pstack-list
@@ -627,6 +632,10 @@ global-env obj!
 
     2swap
 
+    false boolean-type \ Add flag signifying continuation restore
+
+    2swap
+
     restore-return-stack
 ;