The Lambda Lab
/
projects
/
scheme.forth.jl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated README.
[scheme.forth.jl.git]
/
scheme.4th
diff --git
a/scheme.4th
b/scheme.4th
index
244a33f
..
f8dd089
100644
(file)
--- a/
scheme.4th
+++ b/
scheme.4th
@@
-139,11
+139,6
@@
variable nextfree
cdr-cells + !
;
cdr-cells + !
;
-: caar car car ;
-: cadr cdr car ;
-: cdar car cdr ;
-: cddr cdr cdr ;
-
: nil 0 nil-type ;
: nil? nil-type istype? ;
: nil 0 nil-type ;
: nil? nil-type istype? ;
@@
-1058,7
+1053,7
@@
parse-idx-stack parse-idx-sp !
quote-symbol tagged-list? ;
: quote-body ( quote-obj -- quote-body-obj )
quote-symbol tagged-list? ;
: quote-body ( quote-obj -- quote-body-obj )
- c
ad
r ;
+ c
dr ca
r ;
: quasiquote? ( obj -- obj bool )
quasiquote-symbol tagged-list? ;
: quasiquote? ( obj -- obj bool )
quasiquote-symbol tagged-list? ;
@@
-1094,15
+1089,12
@@
parse-idx-stack parse-idx-sp !
;
defer eval-quasiquote-item
;
defer eval-quasiquote-item
-: eval-quasiquote-list ( env obj -- res )
- nil? if
- 2swap 2drop exit
- then
-
+: eval-quasiquote-pair ( env obj -- res )
2over 2over ( env obj env obj )
2over 2over ( env obj env obj )
- cdr recurse
- -2rot car ( cdritems env objcar )
+ cdr eval-quasiquote-item
+
+ -2rot car ( cdritem env objcar )
unquote-splicing? if
eval-unquote ( cdritems caritem )
unquote-splicing? if
eval-unquote ( cdritems caritem )
@@
-1120,12
+1112,16
@@
defer eval-quasiquote-item
;
:noname ( env obj )
;
:noname ( env obj )
+ nil? if
+ 2swap 2drop exit
+ then
+
unquote? if
eval-unquote exit
then
pair-type istype? if
unquote? if
eval-unquote exit
then
pair-type istype? if
- eval-quasiquote-
list
exit
+ eval-quasiquote-
pair
exit
then
2swap 2drop
then
2swap 2drop
@@
-1407,6
+1403,7
@@
hide env
endcase
;
endcase
;
+( Simply evaluates the given procedure with expbody as its argument. )
: macro-expand ( proc expbody -- result )
2swap
2dup procedure-body ( expbody proc procbody )
: macro-expand ( proc expbody -- result )
2swap
2dup procedure-body ( expbody proc procbody )