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

json.writer: faster writing, makes the json benchmark almost twice as fast.

db4
John Benediktsson 2012-07-11 19:31:57 -07:00
parent a9b6561fe3
commit a4894fe8c1
1 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
basis/json/writer/writer.factor
View File

@ -2,7 +2,7 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors kernel io.streams.string io strings splitting USING: accessors kernel io.streams.string io strings splitting
sequences math math.parser assocs classes words namespaces make sequences math math.parser assocs classes words namespaces make
prettyprint hashtables mirrors tr json fry ; prettyprint hashtables mirrors tr json fry combinators ;
IN: json.writer IN: json.writer
#! Writes the object out to a stream in JSON format #! Writes the object out to a stream in JSON format
@ -22,7 +22,14 @@ M: json-null json-print ( null -- )
drop "null" write ; drop "null" write ;
M: string json-print ( obj -- ) M: string json-print ( obj -- )
CHAR: " write1 "\"" split "\\\"" join CHAR: \r swap remove "\n" split "\\r\\n" join write CHAR: " write1 ; CHAR: " write1 [
{
{ CHAR: " [ "\\\"" write ] }
{ CHAR: \r [ ] }
{ CHAR: \n [ "\\r\\n" write ] }
[ write1 ]
} case
] each CHAR: " write1 ;
M: integer json-print ( num -- ) M: integer json-print ( num -- )
number>string write ; number>string write ;
@ -31,25 +38,44 @@ M: real json-print ( num -- )
>float number>string write ; >float number>string write ;
M: sequence json-print ( array -- ) M: sequence json-print ( array -- )
CHAR: [ write1 [ >json ] map "," join write CHAR: ] write1 ; CHAR: [ write1 [
unclip-last-slice swap
[ json-print CHAR: , write1 ] each
json-print
] unless-empty CHAR: ] write1 ;
SYMBOL: jsvar-encode? SYMBOL: jsvar-encode?
t jsvar-encode? set-global t jsvar-encode? set-global
TR: jsvar-encode "-" "_" ; TR: jsvar-encode "-" "_" ;
: tuple>fields ( object -- seq ) <PRIVATE
<mirror>
jsvar-encode? get
'[ [ swap _ [ jsvar-encode ] when >json % ":" % >json % ] "" make ] { } assoc>map ;
M: tuple json-print ( tuple -- ) : json-print-assoc ( assoc -- )
CHAR: { write1 tuple>fields "," join write CHAR: } write1 ; CHAR: { write1 >alist [
unclip-last-slice swap
jsvar-encode? get [
[
[ first jsvar-encode json-print ]
[ CHAR: : write1 second json-print ] bi
CHAR: , write1
] each
[ first jsvar-encode json-print ]
[ CHAR: : write1 second json-print ] bi
] [
[
[ first json-print ]
[ CHAR: : write1 second json-print ] bi
CHAR: , write1
] each
[ first json-print ]
[ CHAR: : write1 second json-print ] bi
] if
] unless-empty CHAR: } write1 ;
M: hashtable json-print ( hashtable -- ) PRIVATE>
CHAR: { write1
jsvar-encode? get M: tuple json-print ( tuple -- ) <mirror> json-print-assoc ;
'[ [ swap _ [ jsvar-encode ] when >json % CHAR: : , >json % ] "" make ] { } assoc>map
"," join write M: hashtable json-print ( hashtable -- ) json-print-assoc ;
CHAR: } write1 ;
M: word json-print name>> json-print ; M: word json-print name>> json-print ;