quasiquote/unquote implemented

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

diff --git a/src/scheme.4th b/src/scheme.4th
index 9b5eb27..72d2c9d 100644 (file)
--- a/src/scheme.4th
+++ b/src/scheme.4th
@@ -10,6 +10,7 @@ include float.4th
 include debugging.4th
 
 defer read
+defer expand
 defer eval
 defer print
 
@@ -261,7 +262,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 +1309,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? ;
 
@@ -1512,12 +1423,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
@@ -1665,11 +1570,6 @@ hide env
         exit
     then
 
-    quasiquote? if
-        2swap eval-quasiquote
-        exit
-    then
-
     variable? if
         2swap lookup-var
         exit
@@ -1712,12 +1612,6 @@ hide env
         exit
     then
 
-    begin? if
-        begin-actions 2swap
-        eval-sequence
-        ['] eval goto-deferred
-    then
-
     application? if
 
         2over 2over ( env exp env exp )
@@ -1754,8 +1648,6 @@ hide env
     extend-env eval-sequence eval
 ;
 
-defer expand
-
 : expand-macro ( exp -- result )
     pair-type istype? invert if exit then
     2dup car symbol-type istype? invert if 2drop exit then
@@ -1774,28 +1666,6 @@ defer expand
     R> drop ['] expand goto-deferred
 ;
 
-: expand-quasiquote-item ( exp -- result )
-    nil? if exit then
-
-    unquote? if
-        unquote-symbol 2swap cdr expand nil cons cons
-        exit
-    then
-    
-    pair? if
-        2dup car recurse
-        2swap cdr recurse
-        cons
-    then
-;
-
-: expand-quasiquote ( exp -- result )
-    quasiquote-symbol 2swap cdr
-
-    expand-quasiquote-item
-
-    cons ;
-
 : expand-definition ( exp -- result )
     define-symbol 2swap
 
@@ -1847,33 +1717,24 @@ defer expand
     2swap if-alternative none? if
         2drop nil
     else
-        nil cons
+        expand nil cons
     then
 
     cons cons cons ;
 
-: expand-begin ( exp -- res )
-    begin-symbol 2swap
-    begin-actions expand-list
-
-    cons ;
-
 : expand-application ( exp -- res )
-    2dup operator
+    2dup operator expand
     2swap operands expand-list
 
     cons ;
 
 :noname ( exp -- result )
-
     expand-macro
 
     self-evaluating? if exit then
 
     quote? if exit then
 
-    quasiquote? if expand-quasiquote exit then
-
     definition? if expand-definition exit then
 
     assignment? if expand-assignment exit then
@@ -1884,8 +1745,6 @@ defer expand
 
     if? if expand-if exit then
 
-    begin? if expand-begin exit then
-
     application? if expand-application exit then
 
 ; is expand
@@ -2128,9 +1987,8 @@ variable gc-stack-depth
 
     include scheme-primitives.4th
 
-    s" scheme-derived-forms.scm" load 2drop
-
-\    s" scheme-library.scm" load 2drop
+    s" testing-library.scm" load 2drop
+    \ s" scheme-library.scm" load 2drop
     
 \ }}}