The Lambda Lab
/
projects
/
scheme.forth.jl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3b232d2
)
Typos
author
Tim Vaughan
<tgvaughan@gmail.com>
Mon, 18 Jul 2016 02:18:17 +0000
(14:18 +1200)
committer
Tim Vaughan
<tgvaughan@gmail.com>
Mon, 18 Jul 2016 02:18:17 +0000
(14:18 +1200)
scheme.4th
patch
|
blob
|
history
diff --git
a/scheme.4th
b/scheme.4th
index
3014bea
..
d075e81
100644
(file)
--- a/
scheme.4th
+++ b/
scheme.4th
@@
-185,7
+185,7
@@
objvar vals
2dup nil objeq? false =
while
2over 2over first-frame
2dup nil objeq? false =
while
2over 2over first-frame
-
lookup-var
-frame if
+
get-vars-vals
-frame if
2drop 2drop
vars fetchobj vals fetchobj true
exit
2drop 2drop
vars fetchobj vals fetchobj true
exit
@@
-222,15
+222,15
@@
hide vals
objvar env
: define-var ( var val env -- )
objvar env
: define-var ( var val env -- )
- env
objset
+ env
setobj
- 2over env
objfetch
( var val var env )
+ 2over env
fetchobj
( var val var env )
get-vars-vals if
2swap 2drop ( var val vals )
set-car!
2drop
else
get-vars-vals if
2swap 2drop ( var val vals )
set-car!
2drop
else
- env
objfetch
+ env
fetchobj
first-frame ( var val frame )
add-binding
then
first-frame ( var val frame )
add-binding
then
@@
-704,7
+704,7
@@
defer read
cdr cdr car ;
: assignment? ( obj -- obj bool )
cdr cdr car ;
: assignment? ( obj -- obj bool )
- set-symbol tagged-list? ;
+ set
!
-symbol tagged-list? ;
: assignment-var ( obj -- var )
cdr car ;
: assignment-var ( obj -- var )
cdr car ;
@@
-712,6
+712,8
@@
defer read
: assignment-val ( obj -- val )
cdr cdr car ;
: assignment-val ( obj -- val )
cdr cdr car ;
+defer eval
+
: eval-definition ( obj env -- res )
2swap
2over 2over ( env obj env obj )
: eval-definition ( obj env -- res )
2swap
2over 2over ( env obj env obj )
@@
-739,7
+741,8
@@
defer read
ok-symbol
;
ok-symbol
;
-: eval ( obj env -- result )
+
+:noname ( obj env -- result )
2swap
self-evaluating? if
2swap
self-evaluating? if
@@
-770,7
+773,7
@@
defer read
bold fg red ." Error evaluating expression - unrecognized type. Aborting." reset-term cr
abort
bold fg red ." Error evaluating expression - unrecognized type. Aborting." reset-term cr
abort
-;
+;
is eval
\ }}}
\ }}}