Merge branch 'master' into call-cc

[scheme.forth.jl.git] / src / scheme.4th

diff --git a/src/scheme.4th b/src/scheme.4th
index 2a509e6..93d2496 100644 (file)
--- a/src/scheme.4th
+++ b/src/scheme.4th
@@ -39,6 +39,7 @@ make-type pair-type
 make-type symbol-type
 make-type primitive-proc-type
 make-type compound-proc-type
+make-type continuation-type
 make-type port-type
 : istype? ( obj type -- obj bool )
     over = ;
@@ -75,12 +76,6 @@ create car-type-cells scheme-memsize allot
 create cdr-cells scheme-memsize allot
 create cdr-type-cells scheme-memsize allot
 
-variable gc-enabled
-false gc-enabled !
-
-: gc-enabled?
-    gc-enabled @ ;
-
 create nextfrees scheme-memsize allot
 :noname
     scheme-memsize 0 do
@@ -96,9 +91,7 @@ variable nextfree
     nextfree !
 
     nextfree @ scheme-memsize >= if
-        gc-enabled? if
-            collect-garbage
-        then
+      collect-garbage
     then
 
     nextfree @ scheme-memsize >= if
@@ -140,6 +133,10 @@ variable nextfree
     cdr-cells + !
 ;
 
+variable object-stack-base
+: init-object-stack-base
+  depth object-stack-base ! ;
+
 : nil 0 nil-type ;
 : nil? nil-type istype? ;
 
@@ -523,6 +520,62 @@ global-env obj!
 
 \ }}}
 
+\ ---- Continuations ---- {{{
+
+: cons-return-stack ( -- listobj )
+  rsp@ 1- rsp0  = if
+    nil exit
+  then
+
+  nil rsp@ 1- rsp0 do
+    i 1+ @ fixnum-type 2swap cons
+  loop
+;
+
+: cons-param-stack ( -- listobj )
+  nil 
+
+  depth 2- object-stack-base @ = if
+    exit
+  then
+
+  depth 2- object-stack-base @ do
+        PSP0 i + 1 + @
+        PSP0 i + 2 + @
+
+        2swap cons
+    2 +loop
+;
+
+: make-continuation
+
+  cons-param-stack
+  cons-return-stack
+  cons drop continuation-type
+;
+
+: continuation->pstack-list
+  drop pair-type car ;
+
+: continuation->rstack-list
+  drop pair-type cdr ;
+
+: restore-param-stack ( continuation -- obj_stack continuation )
+
+  2dup >R >R
+  continuation->pstack-list
+
+  ( Idea: allocate stack space first using psp!,
+    then copy objects from list. )
+;
+
+: restore-continuation
+  \ TODO: replace current parameter and return stacks with
+  \ contents of continuation object.
+;
+
+\ }}}
+
 \ ---- Primitives ---- {{{
 
 : make-primitive ( cfa -- )
@@ -1663,6 +1716,10 @@ parse-idx-stack parse-idx-sp !
                ['] evaluate-eproc goto
         endof
 
+        continuation-type of
+          \ TODO: Apply continuation
+        endof
+
         except-message: ." object '" drop print ." ' not applicable." recoverable-exception throw
     endcase
 ;
@@ -1911,6 +1968,9 @@ parse-idx-stack parse-idx-sp !
 : printcomp ( primobj -- )
     2drop ." <compound procedure>" ;
 
+: printcont ( primobj --)
+    2drop ." <continuation>" ;
+
 : printnone ( noneobj -- )
     2drop ." Unspecified return value" ;
 
@@ -1929,6 +1989,7 @@ parse-idx-stack parse-idx-sp !
     pair-type istype? if ." (" printpair ." )" exit then
     primitive-proc-type istype? if printprim exit then
     compound-proc-type istype? if printcomp exit then
+    continuation-type istype? if printcont exit then
     none-type istype? if printnone exit then
     port-type istype? if printport exit then
 
@@ -1953,14 +2014,6 @@ parse-idx-stack parse-idx-sp !
   or in other variables than the above will result in possible
   memory corruption if the cons triggers the GC. )
 
-variable gc-stack-depth
-
-: enable-gc
-    depth gc-stack-depth !
-    true gc-enabled ! ;
-
-: disable-gc
-    false gc-enabled ! ;
 
 : pairlike? ( obj -- obj bool )
     pair-type istype? if true exit then
@@ -2037,7 +2090,7 @@ variable gc-stack-depth
     console-i/o-port obj@ gc-mark-obj
     global-env obj@ gc-mark-obj
 
-    depth gc-stack-depth @ do
+    depth object-stack-base @ do
         PSP0 i + 1 + @
         PSP0 i + 2 + @
 
@@ -2086,11 +2139,8 @@ variable gc-stack-depth
 
     include scheme-primitives.4th
 
-    enable-gc
-
+    init-object-stack-base
     s" scheme-library.scm" load 2drop
-
-    disable-gc
     
 \ }}}
 
@@ -2118,7 +2168,7 @@ variable gc-stack-depth
 : repl
     empty-parse-str
 
-    enable-gc
+    init-object-stack-base
 
     \ Display welcome message
     welcome-symbol nil cons global-env obj@ eval 2drop
@@ -2132,8 +2182,6 @@ variable gc-stack-depth
             throw false
         endcase
     until
-
-    disable-gc
 ;
 
 forth definitions