clean up fastgraphs

diff --git a/lib/cgraph/flatten.c b/lib/cgraph/flatten.c
index 6e09077f596426666c7eeb7a585e5a1e0827e6f7..3791d6fd3837be28051ab742307bf5f0a12268b5 100644 (file)
--- a/lib/cgraph/flatten.c
+++ b/lib/cgraph/flatten.c
@@ -1,22 +1,22 @@
 #include "cghdr.h"
 
-static void agflatten_elist(Dict_t * d, Dtlink_t ** lptr)
+static void agflatten_elist(Dict_t * d, Dtlink_t ** lptr, int flag)
 {
     dtrestore(d, *lptr);
-    (void) dtflatten(d);
+    dtmethod(d, flag? Dtlist : Dtoset);
     *lptr = dtextract(d);
 }
 
-void agflatten_edges(Agraph_t * g, Agnode_t * n)
+void agflatten_edges(Agraph_t * g, Agnode_t * n, int flag)
 {
     Agsubnode_t *sn;
     Dtlink_t **tmp;
 
        sn = agsubrep(g,n);
     tmp = &(sn->out_seq); /* avoiding - "dereferencing type-punned pointer will break strict-aliasing rules" */
-    agflatten_elist(g->e_seq, tmp);
+    agflatten_elist(g->e_seq, tmp, flag);
     tmp = &(sn->in_seq);
-    agflatten_elist(g->e_seq, tmp);
+    agflatten_elist(g->e_seq, tmp, flag);
 }
 
 void agflatten(Agraph_t * g, int flag)
@@ -25,13 +25,16 @@ void agflatten(Agraph_t * g, int flag)
 
     if (flag) {
        if (g->desc.flatlock == FALSE) {
-           dtflatten(g->n_seq);
-           g->desc.flatlock = TRUE;
+           dtmethod(g->n_seq,Dtlist);
            for (n = agfstnode(g); n; n = agnxtnode(g,n))
-               agflatten_edges(g, n);
+               agflatten_edges(g, n, flag);
+           g->desc.flatlock = TRUE;
        }
     } else {
        if (g->desc.flatlock) {
+           dtmethod(g->n_seq,Dtoset);
+           for (n = agfstnode(g); n; n = agnxtnode(g,n))
+               agflatten_edges(g, n, flag);
            g->desc.flatlock = FALSE;
        }
     }