Release 0.5.9.

[helm.git] / helm / software / components / extlib / graphvizPp.ml

diff --git a/helm/software/components/extlib/graphvizPp.ml b/helm/software/components/extlib/graphvizPp.ml
index 46432883744ad7c68406be2d040dbe40134f25ce..ed5bbdc54c69c1d1557a43635d72bd4c2a4f1ca3 100644 (file)
--- a/helm/software/components/extlib/graphvizPp.ml
+++ b/helm/software/components/extlib/graphvizPp.ml
@@ -49,16 +49,10 @@ module Dot =
   struct
     let attribute fmt (k, v) = fprintf fmt "@[<hv2>%s=@,\"%s\",@]" k v
     let attributes attrs fmt = List.iter (attribute fmt) attrs
-    let quote_string quote s = if quote then "\"" ^s ^ "\"" else s
 
     let node name ~quote ?(attrs = []) fmt =
-      fprintf fmt "@[<hov2>%s@ [" (quote_string quote name);
-      attributes attrs fmt;
-      fprintf fmt "];@]@,"
-
-    let edge ~quote name1 name2 ?(attrs = []) fmt =
-      fprintf fmt "@[<hov2>%s ->@ %s@ [" 
-         (quote_string quote name1) (quote_string quote name2);
+      let quote_string = if quote then "\"" else "" in
+      fprintf fmt "@[<hov2>%s%s%s@ [" quote_string name quote_string;
       attributes attrs fmt;
       fprintf fmt "];@]@,"
 
@@ -74,7 +68,10 @@ module Dot =
       | None -> ())
 
     let node = node ~quote:true
-    let edge = edge ~quote:true
+    let edge name1 name2 ?(attrs = []) fmt =
+      fprintf fmt "@[<hov2>%s ->@ %s@ [" name1 name2;
+      attributes attrs fmt;
+      fprintf fmt "];@]@,"
     let raw s fmt = pp_print_string fmt s
     let trailer fmt = fprintf fmt "@,}@]%!"
   end