steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Spelling error, more tests

db4
James Cash 2008-05-26 15:48:22 -04:00
parent e8be61ece5
commit 4b3560d068
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
extra/lisp/lisp-tests.factor
View File

@ -1,6 +1,6 @@
! Copyright (C) 2008 James Cash ! Copyright (C) 2008 James Cash
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: lisp lisp.parser tools.test sequences math kernel parser ; USING: lisp lisp.parser tools.test sequences math kernel parser arrays ;
IN: lisp.test IN: lisp.test
@ -10,8 +10,11 @@ IN: lisp.test
"#f" [ f ] lisp-define "#f" [ f ] lisp-define
"#t" [ t ] lisp-define "#t" [ t ] lisp-define
"+" "math" "+" define-primitve "+" "math" "+" define-primitive
"-" "math" "-" define-primitve "-" "math" "-" define-primitive
"list" [ >array ] lisp-define
"map" [ [ swap map ] compose call ] lisp-define
{ 5 } [ { 5 } [
[ 2 3 ] "+" <lisp-symbol> funcall [ 2 3 ] "+" <lisp-symbol> funcall
@ -22,26 +25,30 @@ IN: lisp.test
] 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-eval
] unit-test ] unit-test
{ 42 } [ { 42 } [
"((lambda (x y z) (+ x (- y z))) 40 3 1)" lisp-string>factor call "((lambda (x y z) (+ x (- y z))) 40 3 1)" lisp-eval
] unit-test ] unit-test
{ 1 } [ { 1 } [
"(if #t 1 2)" lisp-string>factor call "(if #t 1 2)" lisp-eval
] unit-test ] unit-test
{ "b" } [ { "b" } [
"(cond (#f \"a\") (#t \"b\"))" lisp-string>factor call "(cond (#f \"a\") (#t \"b\"))" lisp-eval
] unit-test ] unit-test
{ 5 } [ { 5 } [
"(begin (+ 1 4))" lisp-string>factor call "(begin (+ 1 4))" lisp-eval
] unit-test ] unit-test
{ 3 } [ { 3 } [
"((lambda (x) (if x (begin (+ 1 2)) (- 3 5))) #t)" lisp-string>factor call "((lambda (x) (if x (begin (+ 1 2)) (- 3 5))) #t)" lisp-eval
] unit-test
{ { 1 2 3 4 5 } } [
"(list 1 2 3 4 5)" lisp-eval
] unit-test ] unit-test
] with-interactive-vocabs ] with-interactive-vocabs

5
extra/lisp/lisp.factor
View File

@ -78,6 +78,9 @@ PRIVATE>
: 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 ;
: lisp-eval ( str -- * )
lisp-string>factor call ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
SYMBOL: lisp-env SYMBOL: lisp-env
@ -98,5 +101,5 @@ ERROR: no-such-var var ;
: funcall ( quot sym -- * ) : funcall ( quot sym -- * )
dup lisp-symbol? [ lookup-var ] when call ; inline dup lisp-symbol? [ lookup-var ] when call ; inline
: define-primitve ( name vocab word -- ) : define-primitive ( name vocab word -- )
swap lookup 1quotation '[ , compose call ] lisp-define ; swap lookup 1quotation '[ , compose call ] lisp-define ;