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

libs: more cleanup

locals-and-roots
Doug Coleman 2016-06-20 15:38:40 -07:00
parent 0c170345af
commit 9bfdf92105
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/json/reader/reader.factor
View File

@ -110,11 +110,11 @@ defer: (read-json-string)
{ {
{ char: \" [ over read-json-string suffix! ] } { char: \" [ over read-json-string suffix! ] }
{ char: \[ [ json-open-array ] } { char: \[ [ json-open-array ] }
{ char: , [ v-over-push ] } { char: \, [ v-over-push ] }
{ char: ] [ json-close-array ] } { char: \] [ json-close-array ] }
{ char: \{ [ json-open-hash ] } { char: \{ [ json-open-hash ] }
{ char: \: [ v-pick-push ] } { char: \: [ v-pick-push ] }
{ char: } [ json-close-hash ] } { char: \} [ json-close-hash ] }
{ char: \s [ ] } { char: \s [ ] }
{ char: \t [ ] } { char: \t [ ] }
{ char: \r [ ] } { char: \r [ ] }

6
libs/json/writer/writer.factor
View File

@ -114,7 +114,7 @@ M: sequence stream-json-print
char: \[ over stream-write1 swap char: \[ over stream-write1 swap
over '[ char: , _ stream-write1 ] over '[ char: , _ stream-write1 ]
pick '[ _ stream-json-print ] interleave pick '[ _ stream-json-print ] interleave
char: ] swap stream-write1 ; char: \] swap stream-write1 ;
PRIVATE< PRIVATE<
@ -131,7 +131,7 @@ M: real json-coerce >float number>string ;
:: json-print-assoc ( obj stream -- ) :: json-print-assoc ( obj stream -- )
char: \{ stream stream-write1 obj >alist char: \{ stream stream-write1 obj >alist
[ char: , stream stream-write1 ] [ char: \, stream stream-write1 ]
json-friendly-keys? get json-friendly-keys? get
json-coerce-keys? get '[ json-coerce-keys? get '[
first2 [ first2 [
@ -144,7 +144,7 @@ M: real json-coerce >float number>string ;
stream stream-json-print stream stream-json-print
] bi* ] bi*
] interleave ] interleave
char: } stream stream-write1 ; char: \} stream stream-write1 ;
PRIVATE> PRIVATE>

4
libs/math/extras/extras-tests.factor
View File

@ -74,11 +74,11 @@ in: math.extras.test
{ 17/160 } [ { 80 60 10 20 30 } normalized-herfindahl ] unit-test { 17/160 } [ { 80 60 10 20 30 } normalized-herfindahl ] unit-test
{ { 0 5 1 2 2 } } [ { { 0 5 1 2 2 } } [
{ -10 10 2 2.5 3 } { 1 2 3 4 5 } digitize] { -10 10 2 2.5 3 } { 1 2 3 4 5 } digitize-left
] unit-test ] unit-test
{ { 0 5 2 2 3 } } [ { { 0 5 2 2 3 } } [
{ -10 10 2 2.5 3 } { 1 2 3 4 5 } digitize) { -10 10 2 2.5 3 } { 1 2 3 4 5 } digitize-right
] unit-test ] unit-test
{ {

6
libs/math/extras/extras.factor
View File

@ -204,10 +204,10 @@ PRIVATE>
: unique-indices ( seq -- unique indices ) : unique-indices ( seq -- unique indices )
[ members ] keep over dup length iota H{ } zip-as '[ _ at ] map ; [ members ] keep over dup length iota H{ } zip-as '[ _ at ] map ;
: digitize] ( seq bins -- seq' ) : digitize-left ( seq bins -- seq' )
'[ _ bisect-left ] map ; '[ _ bisect-left ] map ;
: digitize) ( seq bins -- seq' ) : digitize-right ( seq bins -- seq' )
'[ _ bisect-right ] map ; '[ _ bisect-right ] map ;
PRIVATE< PRIVATE<
@ -218,7 +218,7 @@ PRIVATE<
PRIVATE> PRIVATE>
: linspace[a,b) ( a b length -- seq ) : linspace[a,b) ( a b length -- seq )
steps ,b) <range> ; steps (,b) <range> ;
: linspace[a,b] ( a b length -- seq ) : linspace[a,b] ( a b length -- seq )
{ {