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
Fixed TCO bug.
[scheme.forth.jl.git]
/
scheme.4th
diff --git
a/scheme.4th
b/scheme.4th
index
cecacff
..
8bc44d3
100644
(file)
--- a/
scheme.4th
+++ b/
scheme.4th
@@
-3,6
+3,11
@@
scheme definitions
include term-colours.4th
include defer-is.4th
include term-colours.4th
include defer-is.4th
+include catch-throw.4th
+
+defer read
+defer eval
+defer print
\ ------ Types ------
\ ------ Types ------
@@
-20,7
+25,7
@@
include defer-is.4th
\ ------ Cons cell memory ------ {{{
\ ------ Cons cell memory ------ {{{
-1000 constant N
+1000
0
constant N
create car-cells N allot
create car-type-cells N allot
create cdr-cells N allot
create car-cells N allot
create car-type-cells N allot
create cdr-cells N allot
@@
-376,8
+381,6
@@
include scheme-primitives.4th
\ ---- Read ---- {{{
\ ---- Read ---- {{{
-defer read
-
variable parse-idx
variable stored-parse-idx
create parse-str 161 allot
variable parse-idx
variable stored-parse-idx
create parse-str 161 allot
@@
-785,8
+788,6
@@
parse-idx-stack parse-idx-sp !
\ ---- Eval ---- {{{
\ ---- Eval ---- {{{
-defer eval
-
: self-evaluating? ( obj -- obj bool )
boolean-type istype? if true exit then
fixnum-type istype? if true exit then
: self-evaluating? ( obj -- obj bool )
boolean-type istype? if true exit then
fixnum-type istype? if true exit then
@@
-972,7
+973,7
@@
defer eval
begin
2dup cdr 2dup nil objeq? false =
while
begin
2dup cdr 2dup nil objeq? false =
while
- -2rot car over ( nextbody env exp env )
+ -2rot car
2
over ( nextbody env exp env )
eval
2drop \ discard result
2swap ( env nextbody )
eval
2drop \ discard result
2swap ( env nextbody )
@@
-981,7
+982,7
@@
defer eval
2drop ( env body )
car 2swap ( exp env )
2drop ( env body )
car 2swap ( exp env )
-
eval \ TODO: t
ail call optimization
+
R> drop ['] eval goto-deferred \ T
ail call optimization
endof
bold fg red ." Object not applicable. Aboring." reset-term cr
endof
bold fg red ." Object not applicable. Aboring." reset-term cr
@@
-1029,7
+1030,8
@@
defer eval
if-alternative
then
if-alternative
then
- 2swap ['] eval goto
+ 2swap
+ ['] eval goto-deferred
then
lambda? if
then
lambda? if
@@
-1057,8
+1059,6
@@
defer eval
\ ---- Print ---- {{{
\ ---- Print ---- {{{
-defer print
-
: printnum ( numobj -- ) drop 0 .R ;
: printbool ( numobj -- )
: printnum ( numobj -- ) drop 0 .R ;
: printbool ( numobj -- )