X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=src%2Fscheme.4th;h=9ad4fb3c38aa1ecf79c0e5468a6f04dace1723e2;hb=41b469d050586a05cd43fdd4c78755616af3f7b4;hp=e5ac9cd9297bb6b2a4908bdefbf47ad09b8c87b1;hpb=632cf90c6a97b1ee01a13ab424051f0a99c4a150;p=scheme.forth.jl.git

diff --git a/src/scheme.4th b/src/scheme.4th
index e5ac9cd..9ad4fb3 100644
--- 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 = ;
@@ -62,7 +63,7 @@ variable nextexception
 make-exception recoverable-exception
 make-exception unrecoverable-exception
 
-: throw reset-term throw ;
+: throw reset-term cr throw ;
 
 \ }}}
 
@@ -90,7 +91,7 @@ variable nextfree
     nextfree !
 
     nextfree @ scheme-memsize >= if
-        collect-garbage
+      collect-garbage
     then
 
     nextfree @ scheme-memsize >= if
@@ -132,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? ;
 
@@ -521,6 +526,47 @@ 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
+;
+
+: restore-continuation
+  \ TODO: replace current parameter and return stacks with
+  \ contents of continuation object.
+;
+
+\ }}}
+
 \ ---- Primitives ---- {{{
 
 : make-primitive ( cfa -- )
@@ -1273,6 +1319,11 @@ parse-idx-stack parse-idx-sp !
         exit
     then
 
+    nextchar [char] ) = if
+        inc-parse-idx
+        except-message: ." unmatched closing parenthesis." recoverable-exception throw
+    then
+
     \ Anything else is parsed as a symbol
     readsymbol charlist>symbol
 
@@ -1286,7 +1337,7 @@ parse-idx-stack parse-idx-sp !
 
 \ }}}
 
-\ ---- Eval ---- {{{
+\ ---- Syntax ---- {{{
 
 : self-evaluating? ( obj -- obj bool )
     boolean-type istype? if true exit then
@@ -1327,20 +1378,6 @@ parse-idx-stack parse-idx-sp !
 : definition-val ( obj -- val )
     cdr cdr car ;
 
-: eval-definition ( obj env -- res )
-    2swap
-    2over 2over
-    definition-val 2swap
-    eval
-
-    2swap definition-var 2swap
-
-    2rot
-    define-var
-
-    ok-symbol
-;
-
 : assignment? ( obj -- obj bool )
     set!-symbol tagged-list? ;
 
@@ -1350,20 +1387,6 @@ parse-idx-stack parse-idx-sp !
 : assignment-val ( obj -- val )
     cdr cdr car ;
 
-: eval-assignment ( obj env -- res )
-    2swap 
-    2over 2over ( env obj env obj )
-    assignment-val 2swap ( env obj valexp env )
-    eval  ( env obj val )
-    
-    2swap assignment-var 2swap ( env var val )
-
-    2rot ( var val env )
-    set-var
-
-    ok-symbol
-;
-
 : macro-definition? ( obj -- obj bool )
     define-macro-symbol tagged-list? ;
 
@@ -1376,22 +1399,6 @@ parse-idx-stack parse-idx-sp !
 : macro-definition-body ( exp -- body )
     cdr cdr ;
 
-objvar env
-: eval-define-macro ( obj env -- res )
-    env obj!
-
-    2dup macro-definition-name 2swap ( name obj )
-    2dup macro-definition-params 2swap ( name params obj )
-    macro-definition-body ( name params body )
-
-    env obj@ ( name params body env )
-
-    make-macro
-
-    ok-symbol
-;
-hide env
-
 : if? ( obj -- obj bool )
     if-symbol tagged-list? ;
 
@@ -1429,32 +1436,6 @@ hide env
 : lambda-body ( obj -- body )
     cdr cdr ;
 
-: eval-sequence ( explist env -- finalexp env )
-    ( Evaluates all bar the final expressions in
-      an an expression list. The final expression
-      is returned to allow for tail optimization. )
-
-    2swap ( env explist )
-
-    \ Abort on empty list
-    nil? if
-        2drop none
-        2swap exit
-    then
-
-    begin
-        2dup cdr ( env explist nextexplist )
-        nil? false =
-    while
-        -2rot car 2over ( nextexplist env exp env )
-        eval
-        2drop \ discard result
-        2swap ( env nextexplist )
-    repeat
-
-    2drop car 2swap ( finalexp env )
-;
-
 : application? ( obj -- obj bool )
     pair-type istype? ;
 
@@ -1473,18 +1454,6 @@ hide env
 : rest-operands ( operands -- other-operands )
     cdr ;
 
-: list-of-vals ( args env -- vals )
-    2swap
-
-    2dup nooperands? if
-        2swap 2drop
-    else
-        2over 2over first-operand 2swap eval
-        -2rot rest-operands 2swap recurse
-        cons
-    then
-;
-
 : procedure-params ( proc -- params )
     drop pair-type car ;
 
@@ -1529,116 +1498,9 @@ hide env
     2swap
 ;
 
-: apply ( proc argvals -- result )
-        2swap dup case
-            primitive-proc-type of
-                drop execute     
-            endof
-
-            compound-proc-type of
-                2dup procedure-body ( argvals proc body )
-                -2rot 2dup procedure-params ( body argvals proc argnames )
-                -2rot procedure-env ( body argnames argvals procenv )
-
-                -2rot 2swap
-                flatten-proc-args
-                2swap 2rot
-
-                extend-env ( body env )
-
-                eval-sequence
-
-                R> drop ['] eval goto-deferred  \ Tail call optimization
-            endof
-
-            except-message: ." object '" drop print ." ' not applicable." recoverable-exception throw
-        endcase
-;
-
-:noname ( obj env -- result )
-    2swap
-
-    \ --- DEBUG ---
-    ( 
-      fg yellow ." Evaluating: " bold 2dup print reset-term
-      space fg green ." PS: " bold depth . reset-term
-      space fg blue  ." RS: " bold RSP@ RSP0 - . reset-term cr
-    )
-
-    self-evaluating? if
-        2swap 2drop
-        exit
-    then
-
-    quote? if
-        quote-body
-        2swap 2drop
-        exit
-    then
-
-    variable? if
-        2swap lookup-var
-        exit
-    then
-
-    definition? if
-        2swap eval-definition
-        exit
-    then
-
-    assignment? if
-        2swap eval-assignment
-        exit
-    then
-
-    macro-definition? if
-        2swap eval-define-macro
-        exit
-    then
-
-    if? if
-        2over 2over
-        if-predicate
-        2swap eval 
-
-        true? if
-            if-consequent
-        else
-            if-alternative
-        then
-
-        2swap
-        ['] eval goto-deferred
-    then
-
-    lambda? if
-        2dup lambda-parameters
-        2swap lambda-body
-        2rot make-procedure
-        exit
-    then
-
-    application? if
-
-        2over 2over ( env exp env exp )
-        operator ( env exp env opname )
-
-        2swap eval ( env exp proc )
-
-        -2rot ( proc env exp )
-        operands 2swap ( proc operands env )
-        list-of-vals ( proc argvals )
-
-        apply
-        exit
-    then
-
-    except-message: ." tried to evaluate object with unknown type." recoverable-exception throw
-; is eval
-
 \ }}}
 
-\ ---- Analyze ----
+\ ---- Analyze ---- {{{
 
 : evaluate-eproc ( eproc env --- res )
 
@@ -1658,8 +1520,6 @@ hide env
     \ Final element of eproc list is primitive procedure
     drop \ dump type signifier
 
-    .s cr \ DEBUG
-
     goto \ jump straight to primitive procedure (executor)
 ;
 
@@ -1719,28 +1579,6 @@ hide env
     nil cons cons cons
 ;
 
-: if-executor ( cproc aproc pproc env -- res )
-    2swap 2over ( cproc aproc env pproc env -- res )
-    evaluate-eproc
-
-    true? if
-        2swap 2drop
-    else
-        2rot 2drop
-    then
-
-    evaluate-eproc
-;
-
-: analyze-if ( exp -- eproc )
-    2dup if-predicate analyze
-    2swap 2dup if-consequent analyze
-    2swap if-alternative analyze
-
-    ['] if-executor primitive-proc-type
-    nil cons cons cons cons
-;
-
 : sequence-executor ( eproc-list env -- res )
     2swap
 
@@ -1748,7 +1586,6 @@ hide env
         2dup cdr ( env elist elist-rest)
         nil? invert
     while
-
         -2rot car 2over ( elist-rest env elist-head env )
         evaluate-eproc  ( elist-rest env head-res )
         2drop 2swap     ( env elist-rest )
@@ -1774,6 +1611,42 @@ hide env
     nil cons cons
 ;
 
+
+: macro-definition-executor  ( name params bproc env -- ok )
+    make-macro ok-symbol
+;
+
+: analyze-macro-definition ( exp -- eproc )
+    2dup macro-definition-name
+    2swap 2dup macro-definition-params
+    2swap macro-definition-body analyze-sequence
+
+    ['] macro-definition-executor primitive-proc-type
+    nil cons cons cons cons
+;
+
+: if-executor ( cproc aproc pproc env -- res )
+    2swap 2over ( cproc aproc env pproc env -- res )
+    evaluate-eproc
+
+    true? if
+        2swap 2drop
+    else
+        2rot 2drop
+    then
+
+    ['] evaluate-eproc goto
+;
+
+: analyze-if ( exp -- eproc )
+    2dup if-consequent analyze
+    2swap 2dup if-alternative analyze
+    2swap if-predicate analyze
+
+    ['] if-executor primitive-proc-type
+    nil cons cons cons cons
+;
+
 : lambda-executor ( params bproc env -- res )
     make-procedure
     ( Although this is packaged up as a regular compound procedure,
@@ -1814,22 +1687,14 @@ hide env
     then
 ;
 
-: application-executor ( operator-proc arg-procs env -- res )
-    2rot 2over ( aprocs env fproc env )
-    evaluate-eproc ( aprocs env proc )
-
-    -2rot 2swap ( proc env aprocs )
-    evaluate-operand-eprocs ( proc vals )
-
-    2swap ( vals proc )
-    
+: apply ( vals proc )
     dup case
         primitive-proc-type of
             drop execute
         endof
 
         compound-proc-type of
-                2dup procedure-body ( argvals proc body )
+                2dup procedure-body ( argvals proc bproc )
                 -2rot 2dup procedure-params ( bproc argvals proc argnames )
                 -2rot procedure-env ( bproc argnames argvals procenv )
 
@@ -1842,10 +1707,26 @@ hide env
                ['] evaluate-eproc goto
         endof
 
+        continuation-type of
+          \ TODO: Apply continuation
+        endof
+
         except-message: ." object '" drop print ." ' not applicable." recoverable-exception throw
     endcase
 ;
 
+: application-executor ( operator-proc arg-procs env -- res )
+    2rot 2over ( aprocs env fproc env )
+    evaluate-eproc ( aprocs env proc )
+
+    -2rot 2swap ( proc env aprocs )
+    evaluate-operand-eprocs ( proc vals )
+
+    2swap ( vals proc )
+
+    ['] apply goto
+;
+
 : analyze-application ( exp -- eproc )
     2dup operator analyze
     2swap operands operand-eproc-list
@@ -1856,74 +1737,54 @@ hide env
 
 :noname ( exp --- eproc )
 
-    self-evaluating? if
-        analyze-self-evaluating
-        exit
-    then
+    self-evaluating? if analyze-self-evaluating exit then
 
-    quote? if
-        analyze-quoted
-        exit
-    then
+    quote? if analyze-quoted exit then
     
-    variable? if
-        analyze-variable
-        exit
-    then
+    variable? if analyze-variable exit then
 
-    definition? if
-        analyze-definition
-        exit
-    then
+    definition? if analyze-definition exit then
 
-    assignment? if
-        analyze-assignment
-        exit
-    then
+    assignment? if analyze-assignment exit then
 
-    if? if
-        analyze-if
-        exit
-    then
+    macro-definition? if analyze-macro-definition exit then
 
-    lambda? if
-        analyze-lambda
-        exit
-    then
+    if? if analyze-if exit then
 
-    application? if
-        analyze-application
-        exit
-    then
+    lambda? if analyze-lambda exit then
+
+    application? if analyze-application exit then
 
-    
     except-message: ." tried to analyze unknown expression type." recoverable-exception throw
 
 ; is analyze
 
+\ }}}
 
 \ ---- Macro Expansion ---- {{{
 
 ( Simply evaluates the given procedure with expbody as its argument. )
 : macro-eval ( proc expbody -- result )
     2swap
-    2dup procedure-body ( expbody proc procbody )
-    -2rot 2dup procedure-params ( procbody expbody proc argnames )
-    -2rot procedure-env ( procbody argnames expbody procenv )
+    2dup procedure-body ( expbody proc bproc )
+    -2rot 2dup procedure-params ( bproc expbody proc argnames )
+    -2rot procedure-env ( bproc argnames expbody procenv )
     
     -2rot 2swap
     flatten-proc-args
     2swap 2rot
 
-    extend-env eval-sequence eval
+    extend-env ( bproc env )
+
+    ['] evaluate-eproc goto
 ;
 
 : expand-macro ( exp -- result )
     pair-type istype? invert if exit then
+
     2dup car symbol-type istype? invert if 2drop exit then
-    
-    lookup-macro nil? if
-        2drop exit then
+
+    lookup-macro nil? if 2drop exit then
 
     2over cdr macro-eval
 
@@ -2021,6 +1882,10 @@ hide env
 
 \ }}}
 
+:noname ( exp env -- res )
+    2swap expand analyze 2swap evaluate-eproc
+; is eval
+
 \ ---- Print ---- {{{
 
 : printfixnum ( fixnum -- ) drop 0 .R ;
@@ -2094,6 +1959,9 @@ hide env
 : printcomp ( primobj -- )
     2drop ." <compound procedure>" ;
 
+: printcont ( primobj --)
+    2drop ." <continuation>" ;
+
 : printnone ( noneobj -- )
     2drop ." Unspecified return value" ;
 
@@ -2112,6 +1980,7 @@ hide env
     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
 
@@ -2122,21 +1991,6 @@ hide env
 
 \ ---- Garbage Collection ---- {{{
 
-variable gc-enabled
-false gc-enabled !
-
-variable gc-stack-depth
-
-: enable-gc
-    depth gc-stack-depth !
-    true gc-enabled ! ;
-
-: disable-gc
-    false gc-enabled ! ;
-
-: gc-enabled?
-    gc-enabled @ ;
-
 : pairlike? ( obj -- obj bool )
     pair-type istype? if true exit then
     string-type istype? if true exit then
@@ -2212,7 +2066,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 + @
 
@@ -2236,8 +2090,14 @@ variable gc-stack-depth
     ok-symbol ( port res )
 
     begin
+        \ DEBUG
+        \ bold fg blue ." READ from " 2over drop . ." ==> " reset-term
+
         2over read-port ( port res obj )
 
+        \ DEBUG
+        \ 2dup print cr
+
         2dup EOF character-type objeq? if
             2drop 2swap close-port
             exit
@@ -2245,8 +2105,6 @@ variable gc-stack-depth
 
         2swap 2drop ( port obj )
 
-        expand
-
         global-env obj@ eval ( port res )
     again
 ;
@@ -2257,7 +2115,8 @@ variable gc-stack-depth
 
     include scheme-primitives.4th
 
-    \ s" scheme-library.scm" load 2drop
+    init-object-stack-base
+    s" scheme-library.scm" load 2drop
     
 \ }}}
 
@@ -2275,8 +2134,6 @@ variable gc-stack-depth
         true exit
     then
 
-    expand
-
     global-env obj@ eval
 
     fg cyan ." ; " print reset-term
@@ -2287,10 +2144,10 @@ 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
+    welcome-symbol nil cons global-env obj@ eval 2drop
 
     begin
         ['] repl-body catch