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

present: adding M\ complex present.

db4
John Benediktsson 2015-05-11 17:57:11 -07:00
parent 46fd0b5794
commit 1f2ecfde76
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
basis/present/present-tests.factor
View File

@ -1,8 +1,14 @@
IN: present.tests IN: present.tests
USING: tools.test vocabs.hierarchy present math vocabs sequences kernel ; USING: kernel math present sequences tools.test vocabs
vocabs.hierarchy ;
[ "3" ] [ 3 present ] unit-test { "3" } [ 3 present ] unit-test
[ "Hi" ] [ "Hi" present ] unit-test { "Hi" } [ "Hi" present ] unit-test
[ "+" ] [ \ + present ] unit-test { "+" } [ \ + present ] unit-test
[ "kernel" ] [ "kernel" lookup-vocab present ] unit-test { "kernel" } [ "kernel" lookup-vocab present ] unit-test
[ ] [ all-vocabs-recursive filter-vocabs [ present ] map drop ] unit-test { } [ all-vocabs-recursive filter-vocabs [ present ] map drop ] unit-test
{ "1+1j" } [ C{ 1 1 } present ] unit-test
{ "1-1j" } [ C{ 1 -1 } present ] unit-test
{ "-1+1j" } [ C{ -1 1 } present ] unit-test
{ "-1-1j" } [ C{ -1 -1 } present ] unit-test

10
basis/present/present.factor
View File

@ -1,13 +1,21 @@
! Copyright (C) 2008, 2009 Slava Pestov. ! Copyright (C) 2008, 2009 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors effects io.pathnames kernel math math.parser USING: accessors effects io.pathnames kernel math math.parser
strings vocabs words ; sequences strings vocabs words ;
IN: present IN: present
GENERIC: present ( object -- string ) GENERIC: present ( object -- string )
M: real present number>string ; M: real present number>string ;
M: complex present ( c -- str )
[ real>> number>string ]
[
imaginary>>
[ number>string ]
[ 0 >= [ "+" prepend ] when ] bi
] bi "j" 3append ;
M: string present ; M: string present ;
M: word present name>> ; M: word present name>> ;