Adding define-primitive word
parent
70ef7d005c
commit
88576aefe4
|
@ -6,14 +6,12 @@ IN: lisp.test
|
||||||
|
|
||||||
init-env
|
init-env
|
||||||
|
|
||||||
"+" [ first2 + ] lisp-define
|
"+" "math" "+" define-primitve
|
||||||
|
|
||||||
{ [ first2 + ] } [
|
{ 5 } [
|
||||||
"+" lisp-get
|
[ 2 3 ] "+" <lisp-symbol> funcall
|
||||||
] unit-test
|
] unit-test
|
||||||
|
|
||||||
{ 3 } [
|
{ 3 } [
|
||||||
[
|
|
||||||
"((lambda (x y) (+ x y)) 1 2)" lisp-string>factor call
|
"((lambda (x y) (+ x y)) 1 2)" lisp-string>factor call
|
||||||
] with-interactive-vocabs
|
|
||||||
] unit-test
|
] unit-test
|
|
@ -2,7 +2,7 @@
|
||||||
! See http://factorcode.org/license.txt for BSD license.
|
! See http://factorcode.org/license.txt for BSD license.
|
||||||
USING: kernel peg sequences arrays strings combinators.lib
|
USING: kernel peg sequences arrays strings combinators.lib
|
||||||
namespaces combinators math bake locals locals.private accessors
|
namespaces combinators math bake locals locals.private accessors
|
||||||
vectors syntax lisp.parser assocs parser sequences.lib ;
|
vectors syntax lisp.parser assocs parser sequences.lib words ;
|
||||||
IN: lisp
|
IN: lisp
|
||||||
|
|
||||||
DEFER: convert-form
|
DEFER: convert-form
|
||||||
|
@ -25,6 +25,7 @@ DEFER: funcall
|
||||||
: convert-general-form ( s-exp -- quot )
|
: convert-general-form ( s-exp -- quot )
|
||||||
unclip convert-form swap convert-body [ , % funcall ] bake ;
|
unclip convert-form swap convert-body [ , % funcall ] bake ;
|
||||||
|
|
||||||
|
! words for convert-lambda
|
||||||
<PRIVATE
|
<PRIVATE
|
||||||
: localize-body ( assoc body -- assoc newbody )
|
: localize-body ( assoc body -- assoc newbody )
|
||||||
[ dup lisp-symbol? [ over dupd [ name>> ] dip at swap or ]
|
[ dup lisp-symbol? [ over dupd [ name>> ] dip at swap or ]
|
||||||
|
@ -35,8 +36,6 @@ DEFER: funcall
|
||||||
make-locals dup push-locals swap
|
make-locals dup push-locals swap
|
||||||
[ swap localize-body <s-exp> convert-form swap pop-locals ] dip swap ;
|
[ swap localize-body <s-exp> convert-form swap pop-locals ] dip swap ;
|
||||||
|
|
||||||
PRIVATE>
|
|
||||||
|
|
||||||
: split-lambda ( s-exp -- body vars )
|
: split-lambda ( s-exp -- body vars )
|
||||||
first3 -rot nip [ body>> ] bi@ [ name>> ] map ; inline
|
first3 -rot nip [ body>> ] bi@ [ name>> ] map ; inline
|
||||||
|
|
||||||
|
@ -47,6 +46,7 @@ PRIVATE>
|
||||||
|
|
||||||
: normal-lambda ( body vars -- quot )
|
: normal-lambda ( body vars -- quot )
|
||||||
localize-lambda <lambda> [ , compose ] bake ;
|
localize-lambda <lambda> [ , compose ] bake ;
|
||||||
|
PRIVATE>
|
||||||
|
|
||||||
: convert-lambda ( s-exp -- quot )
|
: convert-lambda ( s-exp -- quot )
|
||||||
split-lambda dup "&rest" swap member? [ rest-lambda ] [ normal-lambda ] if ;
|
split-lambda dup "&rest" swap member? [ rest-lambda ] [ normal-lambda ] if ;
|
||||||
|
@ -68,7 +68,7 @@ PRIVATE>
|
||||||
|
|
||||||
: convert-form ( lisp-form -- quot )
|
: convert-form ( lisp-form -- quot )
|
||||||
dup s-exp? [ body>> convert-list-form ]
|
dup s-exp? [ body>> convert-list-form ]
|
||||||
[ [ , ] [ ] make ] if ;
|
[ [ , ] bake ] if ;
|
||||||
|
|
||||||
: lisp-string>factor ( str -- quot )
|
: lisp-string>factor ( str -- quot )
|
||||||
lisp-expr parse-result-ast convert-form lambda-rewrite call ;
|
lisp-expr parse-result-ast convert-form lambda-rewrite call ;
|
||||||
|
@ -85,7 +85,10 @@ ERROR: no-such-var var ;
|
||||||
swap lisp-env get set-at ;
|
swap lisp-env get set-at ;
|
||||||
|
|
||||||
: lisp-get ( name -- word )
|
: lisp-get ( name -- word )
|
||||||
dup lisp-env get at [ ] [ no-such-var ] ?if ;
|
dup lisp-env get at [ ] [ no-such-var throw ] ?if ;
|
||||||
|
|
||||||
: funcall ( quot sym -- * )
|
: funcall ( quot sym -- * )
|
||||||
dup lisp-symbol? [ name>> lisp-get ] when call ; inline
|
dup lisp-symbol? [ name>> lisp-get ] when call ; inline
|
||||||
|
|
||||||
|
: define-primitve ( name vocab word -- )
|
||||||
|
swap lookup [ [ , ] compose call ] bake lisp-define ;
|
Loading…
Reference in New Issue