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

graphviz.dot: better string escaping using unparse-string

db4
Björn Lindqvist 2015-12-07 08:37:08 +01:00
parent bf28e85405
commit fe204eeaf9
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
extra/graphviz/dot/dot.factor
View File

@ -1,7 +1,7 @@
! Copyright (C) 2012 Alex Vondrak. ! Copyright (C) 2012 Alex Vondrak.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors classes classes.tuple combinators formatting USING: accessors classes classes.tuple combinators formatting graphviz
graphviz graphviz.attributes io io.files kernel namespaces graphviz.attributes io io.files kernel namespaces prettyprint.backend
sequences splitting strings words ; sequences splitting strings words ;
IN: graphviz.dot IN: graphviz.dot
@ -14,11 +14,10 @@ GENERIC: dot. ( obj -- )
! option in case there's a keyword clash, spaces in the ID, ! option in case there's a keyword clash, spaces in the ID,
! etc. This does mean that HTML labels aren't supported, but ! etc. This does mean that HTML labels aren't supported, but
! they don't seem to work using the Graphviz API anyway. ! they don't seem to work using the Graphviz API anyway.
: escape ( str -- str' ) : quote-string ( str -- str' )
"\"" split "\\\"" join "\"" "\"" unparse-string "\0" split "" join ;
"\0" split "" join ;
M: string dot. escape "\"%s\" " printf ; M: string dot. quote-string "%s " printf ;
: id. ( obj -- ) id>> dot. ; : id. ( obj -- ) id>> dot. ;
@ -47,7 +46,7 @@ M: subgraph dot.
"subgraph " write [ id. ] [ statements. ] bi ; "subgraph " write [ id. ] [ statements. ] bi ;
: attribute, ( attr value -- ) : attribute, ( attr value -- )
dup [ "%s=\"%s\"," printf ] [ 2drop ] if ; dup [ quote-string "%s=%s," printf ] [ 2drop ] if ;
: attributes. ( attrs -- ) : attributes. ( attrs -- )
"[" write "[" write