X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=src%2Fscheme.4th;h=7b1da05b8ca27532a6acb014b23f2df39b34c737;hb=6cb77062c9190c13f9b9e2de245412971209c579;hp=8d361fc0fa73f36b091dd8cbd8ec9be7d09962de;hpb=3f10b9976a9b02716a433666d972e30c6b81fd92;p=scheme.forth.jl.git

diff --git a/src/scheme.4th b/src/scheme.4th
index 8d361fc..7b1da05 100644
--- a/src/scheme.4th
+++ b/src/scheme.4th
@@ -3,6 +3,7 @@ scheme definitions
 
 include term-colours.4th
 include defer-is.4th
+include goto.4th
 include catch-throw.4th
 include integer.4th
 include float.4th
@@ -10,6 +11,8 @@ include float.4th
 include debugging.4th
 
 defer read
+defer expand
+defer analyze
 defer eval
 defer print
 
@@ -161,6 +164,10 @@ variable nextfree
     R> R>
 ;
 
+: 2pick ( an bn an-1 bn-1 ... a0 b0 n -- an bn an-1 bn-1 ... a0 b0 an bn )
+    2* 1+ dup
+    >R pick R> pick ;
+
 \ }}}
 
 \ ---- Pre-defined symbols ---- {{{
@@ -261,7 +268,6 @@ create-symbol ok                ok-symbol
 create-symbol if                if-symbol
 create-symbol lambda            lambda-symbol
 create-symbol λ                 λ-symbol
-create-symbol begin             begin-symbol
 create-symbol eof               eof-symbol
 create-symbol no-match          no-match-symbol
 
@@ -1309,95 +1315,6 @@ parse-idx-stack parse-idx-sp !
 : quote-body ( quote-obj -- quote-body-obj )
     cdr car ;
 
-: quasiquote? ( obj -- obj bool )
-    quasiquote-symbol tagged-list? ;
-
-: unquote? ( obj -- obj bool )
-    unquote-symbol tagged-list? ;
-
-: unquote-splicing? ( obj -- obj bool )
-    unquote-splicing-symbol tagged-list? ;
-
-: eval-unquote ( env obj -- res )
-    cdr ( env args )
-
-    nil? if
-        except-message: ." no arguments to unquote." recoverable-exception throw
-    then
-
-    2dup cdr
-    nil? false = if
-        except-message: ." too many arguments to unquote." recoverable-exception throw
-    then
-
-    2drop car 2swap eval
-;
-
-( Create a new list from elements of l1 consed on to l2 )
-: join-lists ( l2 l1 -- l3 )
-    nil? if 2drop exit then
-
-    2dup car
-    -2rot cdr
-    recurse cons
-;
-
-defer eval-quasiquote-item
-: eval-quasiquote-pair ( env obj -- res )
-    2over 2over ( env obj env obj )
-
-    cdr eval-quasiquote-item
-
-    -2rot car ( cdritem env objcar )
-
-    unquote-splicing? if
-        eval-unquote ( cdritems caritem )
-
-        2swap nil? if
-            2drop
-        else
-            2swap join-lists
-        then
-    else
-        eval-quasiquote-item ( cdritems caritem )
-        2swap cons
-    then
-
-;
-
-:noname ( env obj )
-    nil? if
-        2swap 2drop exit
-    then
-
-    unquote? if
-        eval-unquote exit
-    then
-
-    pair-type istype? if
-        eval-quasiquote-pair exit
-    then
-
-    2swap 2drop
-; is eval-quasiquote-item
-
-: eval-quasiquote ( obj env -- res )
-    2swap cdr ( env args )
-
-    nil? if
-        except-message: ." no arguments to quasiquote." recoverable-exception throw
-    then
-
-    2dup cdr ( env args args-cdr )
-    nil? false = if
-        except-message: ." too many arguments to quasiquote." recoverable-exception throw
-    then
-
-    2drop car ( env arg )
-
-    eval-quasiquote-item
-;
-
 : variable? ( obj -- obj bool )
     symbol-type istype? ;
 
@@ -1410,20 +1327,6 @@ defer eval-quasiquote-item
 : 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? ;
 
@@ -1433,20 +1336,6 @@ defer eval-quasiquote-item
 : 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? ;
 
@@ -1459,22 +1348,6 @@ defer eval-quasiquote-item
 : 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? ;
 
@@ -1512,38 +1385,6 @@ hide env
 : lambda-body ( obj -- body )
     cdr cdr ;
 
-: begin? ( obj -- obj bool )
-    begin-symbol tagged-list? ;
-
-: begin-actions ( obj -- actions )
-    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? ;
 
@@ -1562,18 +1403,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 ;
 
@@ -1618,159 +1447,284 @@ hide env
     2swap
 ;
 
-: apply ( proc argvals -- result )
-        2swap dup case
-            primitive-proc-type of
-                drop execute     
-            endof
+\ }}}
+
+\ ---- Analyze ----
 
-            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 )
+: evaluate-eproc ( eproc env --- res )
 
-                -2rot 2swap
-                flatten-proc-args
-                2swap 2rot
+    >R >R
+
+    begin
+        nil? invert
+    while
+        2dup car
+        2swap cdr
+    repeat
+    
+    2drop \ get rid of null
 
-                extend-env ( body env )
+    R> R> 2swap
 
-                eval-sequence
+    \ Final element of eproc list is primitive procedure
+    drop \ dump type signifier
 
-                R> drop ['] eval goto-deferred  \ Tail call optimization
-            endof
+    goto \ jump straight to primitive procedure (executor)
+;
 
-            except-message: ." object '" drop print ." ' not applicable." recoverable-exception throw
-        endcase
+: self-evaluating-executor ( exp env -- exp )
+    2drop ;
+
+: analyze-self-evaluating ( exp --- eproc )
+    ['] self-evaluating-executor primitive-proc-type
+    nil cons cons
+;
+
+: quote-executor ( exp env -- exp )
+    2drop ;
+
+: analyze-quoted ( exp -- eproc )
+    quote-body
+
+    ['] quote-executor primitive-proc-type
+    nil cons cons
+;
+
+: variable-executor ( var env -- val )
+    lookup-var ;
+
+: analyze-variable ( exp -- eproc )
+    ['] variable-executor primitive-proc-type
+    nil cons cons
 ;
 
-:noname ( obj env -- result )
+: definition-executor ( var val-eproc env -- ok )
+    2swap 2over ( var env val-eproc env )
+    evaluate-eproc 2swap ( var val env )
+    define-var
+    ok-symbol
+;
+
+: analyze-definition ( exp -- eproc )
+    2dup definition-var
+    2swap definition-val analyze
+
+    ['] definition-executor primitive-proc-type
+    nil cons cons cons
+;
+
+: assignment-executor ( var val-eproc env -- ok )
+    2swap 2over ( var env val-eproc env )
+    evaluate-eproc 2swap ( var val env )
+    set-var
+    ok-symbol
+;
+
+: analyze-assignment ( exp -- eproc )
+    2dup assignment-var
+    2swap assignment-val analyze ( var val-eproc )
+
+    ['] assignment-executor primitive-proc-type
+    nil cons cons cons
+;
+
+: sequence-executor ( eproc-list env -- res )
     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
-    )
+    begin
+        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 )
+    repeat
+
+    2drop car 2swap
+    ['] evaluate-eproc goto
+;
 
-    self-evaluating? if
-        2swap 2drop
-        exit
-    then
 
-    quote? if
-        quote-body
+: (analyze-sequence) ( explist -- eproc-list )
+    nil? if exit then
+
+    2dup car analyze
+    2swap cdr recurse
+
+    cons
+;
+
+: analyze-sequence ( explist -- eproc )
+    (analyze-sequence)
+    ['] sequence-executor primitive-proc-type
+    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
-        exit
+    else
+        2rot 2drop
     then
 
-    quasiquote? if
-        2swap eval-quasiquote
-        exit
-    then
+    ['] evaluate-eproc goto
+;
 
-    variable? if
-        2swap lookup-var
-        exit
-    then
+: analyze-if ( exp -- eproc )
+    2dup if-consequent analyze
+    2swap 2dup if-alternative analyze
+    2swap if-predicate analyze
 
-    definition? if
-        2swap eval-definition
-        exit
-    then
+    ['] if-executor primitive-proc-type
+    nil cons cons cons cons
+;
 
-    assignment? if
-        2swap eval-assignment
-        exit
-    then
+: lambda-executor ( params bproc env -- res )
+    make-procedure
+    ( Although this is packaged up as a regular compound procedure,
+      the "body" element contains an _eproc_ to be evaluated in an
+      environment resulting from extending env with the parameter
+      bindings. )
+;
 
-    macro-definition? if
-        2swap eval-define-macro
-        exit
+: analyze-lambda ( exp -- eproc )
+    2dup lambda-parameters
+    2swap lambda-body
+
+    nil? if
+        except-message: ." encountered lambda with an empty body." recoverable-exception throw
     then
 
-    if? if
-        2over 2over
-        if-predicate
-        2swap eval 
+    analyze-sequence
 
-        true? if
-            if-consequent
-        else
-            if-alternative
-        then
+    ['] lambda-executor primitive-proc-type
+    nil cons cons cons
+;
 
-        2swap
-        ['] eval goto-deferred
+: operand-eproc-list ( operands -- eprocs )
+    nil? invert if
+        2dup car analyze
+        2swap cdr recurse
+        cons
     then
+;
 
-    lambda? if
-        2dup lambda-parameters
-        2swap lambda-body
-        2rot make-procedure
-        exit
+: evaluate-operand-eprocs ( env aprocs -- vals )
+    nil? if
+        2swap 2drop
+    else
+        2over 2over car 2swap evaluate-eproc ( env aprocs thisval )
+        -2rot cdr recurse ( thisval restvals )
+        cons
     then
+;
 
-    begin? if
-        begin-actions 2swap
-        eval-sequence
-        ['] eval goto-deferred
-    then
+: application-executor ( operator-proc arg-procs env -- res )
+    2rot 2over ( aprocs env fproc env )
+    evaluate-eproc ( aprocs env proc )
 
-    application? if
+    -2rot 2swap ( proc env aprocs )
+    evaluate-operand-eprocs ( proc vals )
 
-        2over 2over ( env exp env exp )
-        operator ( env exp env opname )
+    2swap ( vals proc )
+    
+    dup case
+        primitive-proc-type of
+            drop execute
+        endof
 
-        2swap eval ( env exp proc )
+        compound-proc-type of
+                2dup procedure-body ( argvals proc bproc )
+                -2rot 2dup procedure-params ( bproc argvals proc argnames )
+                -2rot procedure-env ( bproc argnames argvals procenv )
 
-        -2rot ( proc env exp )
-        operands 2swap ( proc operands env )
-        list-of-vals ( proc argvals )
+                -2rot 2swap
+                flatten-proc-args
+                2swap 2rot
 
-        apply
-        exit
-    then
+                extend-env ( bproc env )
 
-    except-message: ." tried to evaluate object with unknown type." recoverable-exception throw
-; is eval
+               ['] evaluate-eproc goto
+        endof
+
+        except-message: ." object '" drop print ." ' not applicable." recoverable-exception throw
+    endcase
+;
+
+: analyze-application ( exp -- eproc )
+    2dup operator analyze
+    2swap operands operand-eproc-list
+
+    ['] application-executor primitive-proc-type
+    nil cons cons cons
+;
+
+:noname ( exp --- eproc )
+
+    self-evaluating? if analyze-self-evaluating exit then
+
+    quote? if analyze-quoted exit then
+    
+    variable? if analyze-variable exit then
+
+    definition? if analyze-definition exit then
+
+    assignment? if analyze-assignment exit then
+
+    macro-definition? if analyze-macro-definition exit then
+
+    if? if analyze-if 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
-;
-
-defer expand
+    extend-env ( bproc env )
 
-: expand-quasiquote ;
-: expand-definition ;
-: expand-assignment ;
-: expand-define-macro ;
-: expand-if ;
-: expand-lambda ;
-: expand-begin ;
-: expand-application ;
+    ['] 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
 
@@ -1783,11 +1737,74 @@ defer expand
     R> drop ['] expand goto-deferred
 ;
 
-:noname ( exp -- result )
+: expand-definition ( exp -- result )
+    define-symbol 2swap
+
+    2dup definition-var
+    2swap definition-val expand
+    nil ( define var val' nil )
+
+    cons cons cons ;
+
+: expand-assignment ( exp -- result )
+    set!-symbol 2swap
 
+    2dup assignment-var
+    2swap assignment-val expand
+    nil ( define var val' nil )
+
+    cons cons cons ;
+
+: expand-list ( exp -- res )
+    nil? if exit then
+
+    2dup car expand
+    2swap cdr recurse
+
+    cons ;
+
+: macro-definition-nameparams
+    cdr car ;
+
+: expand-define-macro ( exp -- res )
+    define-macro-symbol 2swap
+    2dup macro-definition-nameparams
+    2swap macro-definition-body expand-list
+
+    cons cons ;
+
+: expand-lambda ( exp -- res )
+    lambda-symbol 2swap
+    2dup lambda-parameters
+    2swap lambda-body expand-list
+
+    cons cons ;
+
+: expand-if ( exp -- res )
+    if-symbol 2swap
+    
+    2dup if-predicate expand
+    2swap 2dup if-consequent expand
+    2swap if-alternative none? if
+        2drop nil
+    else
+        expand nil cons
+    then
+
+    cons cons cons ;
+
+: expand-application ( exp -- res )
+    2dup operator expand
+    2swap operands expand-list
+
+    cons ;
+
+:noname ( exp -- result )
     expand-macro
 
-    quasiquote? if expand-quasiquote exit then
+    self-evaluating? if exit then
+
+    quote? if exit then
 
     definition? if expand-definition exit then
 
@@ -1795,11 +1812,9 @@ defer expand
 
     macro-definition? if expand-define-macro exit then
 
-    if? if expand-if exit then
-
     lambda? if expand-lambda exit then
 
-    begin? if expand-begin exit then
+    if? if expand-if exit then
 
     application? if expand-application exit then
 
@@ -1807,6 +1822,10 @@ defer expand
 
 \ }}}
 
+:noname ( exp env -- res )
+    2swap expand analyze 2swap evaluate-eproc
+; is eval
+
 \ ---- Print ---- {{{
 
 : printfixnum ( fixnum -- ) drop 0 .R ;
@@ -2031,8 +2050,6 @@ variable gc-stack-depth
 
         2swap 2drop ( port obj )
 
-        expand
-
         global-env obj@ eval ( port res )
     again
 ;
@@ -2043,9 +2060,7 @@ variable gc-stack-depth
 
     include scheme-primitives.4th
 
-    s" scheme-derived-forms.scm" load 2drop
-
-\    s" scheme-library.scm" load 2drop
+    s" scheme-library.scm" load 2drop
     
 \ }}}
 
@@ -2063,8 +2078,6 @@ variable gc-stack-depth
         true exit
     then
 
-    expand
-
     global-env obj@ eval
 
     fg cyan ." ; " print reset-term
@@ -2078,7 +2091,7 @@ variable gc-stack-depth
     enable-gc
 
     \ 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