X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=src%2Fscheme.4th;h=9d646677e32ac788581914cb3201462bb417f51f;hb=f1f104259426dc77ec46ae1ac3bda65fcc19a034;hp=0dec2150fe1d77d44b2592c6d7c8a60b30f3343c;hpb=b445670c931b81438c8e84a79e11500197829fa0;p=scheme.forth.jl.git

diff --git a/src/scheme.4th b/src/scheme.4th
index 0dec215..9d64667 100644
--- a/src/scheme.4th
+++ b/src/scheme.4th
@@ -548,14 +548,19 @@ global-env obj!
         2swap cons
     2 +loop
 
-  depth 2- fixnum-type 2swap cons
+  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
@@ -575,63 +580,61 @@ global-env obj!
   ( Allocate stack space first using psp!,
     then copy objects from list. )
 
-  car drop
+  car drop 2*
   object-stack-base @ psp0 + + psp!
 
   R> R> 2dup cdr
   2swap
-  car drop 2- 0 swap do
+  stack-list-len 1- 0 swap do
 
       2dup car
-      PSP0 object-stack-base @ + i + 2 + !
-      PSP0 object-stack-base @ + i + 1 + !
+      PSP0 object-stack-base @ + i 2* + 2 + !
+      PSP0 object-stack-base @ + i 2* + 1 + !
       cdr
 
-  -2 +loop
+  -1 +loop
 
   2drop
 ;
 
-: list->pad ( list n -- )
+: restore-return-stack ( continuation -- )
+
+    continuation->rstack-list
+
+    2dup cdr 2swap stack-list-len ( list n )
+
+    dup RSP0 + RSP! \ expand return stack to accommodate entries
 
-    pad + 1- \ final dest addr
-    pad      \ initial dest addr
+    ( list n )
+
+    1-  \ initial offset n-1
+    0   \ final offset 0
     swap
     do
-        2dup cdr 2swap car
-        drop i !
+        2dup cdr 2swap car drop
+        RSP0 i 1+ + !
     -1 +loop
 
     2drop
 ;
 
-: restore-return-stack ( continuation -- )
-
-    continuation->rstack-list
+: restore-continuation-with-arg ( continuation obj -- )
 
-    2dup stack-list-len -rot ( n stack-list )
-    2dup cdr 2swap stack-list-len  ( n list n )
+    >R >R \ Store obj on return stack
 
-    list->pad  ( n )
+    2dup >R >R \ Store copy of continuation on return stack
 
-    dup RSP0 + RSP! \ expand return stack to accommodate entries
+    restore-param-stack
 
-    ( n )
-    0   \ initial offset
-    do
-        pad i + @ RSP0 i 1+ + !
-    loop
-;
+    R> R> \ Pop continuation from return stack
 
-: restore-continuation ( continuation -- )
-  \ TODO: replace current parameter and return stacks with
-  \ contents of continuation object.
+    R> R> \ Pop obj from return stack
 
-    2dup >R >R
+    2swap
 
-    restore-param-stack
+    false boolean-type \ Add flag signifying continuation restore
 
-    R> R>
+    2swap
 
     restore-return-stack
 ;
@@ -1779,7 +1782,22 @@ parse-idx-stack parse-idx-sp !
         endof
 
         continuation-type of
-          \ TODO: Apply continuation
+            2swap
+            nil? if
+                except-message: ." Continuations expect exactly 1 argument."
+                recoverable-exception throw
+            then
+
+            2dup cdr
+
+            nil? not if
+                except-message: ." Continuations expect exactly 1 argument."
+                recoverable-exception throw
+            then
+
+            2drop car
+                
+            restore-continuation-with-arg
         endof
 
         except-message: ." object '" drop print ." ' not applicable." recoverable-exception throw
@@ -2166,9 +2184,6 @@ parse-idx-stack parse-idx-sp !
 
 \ }}}
 
-\ DEBUGGING
-xxxx
-
 \ ---- Loading files ---- {{{
 
 : load ( addr n -- finalResult )