Dot2Ruby Subgraph of subgraph

[timotheeguerin]

Bug when parsing a dot string to ruby with Dot2Ruby

It look like subgraphs(B) of subgraph(A) are not parsed:
Nodes and edges of subgraph(B) are included in the subgraph(A) instead of having subgraph(B) in subgraph(A).
So there is no more than one level of subgraph in the graph.

strict digraph G {
    graph [];
    node [label="\N"];
    subgraph "subgraph(A)" {
        subgraph "subgraph(B1)" {
            node1
            node2   
        }
        subgraph "subgraph(B2)" {
            node3
            node4   
        }
    }

}

In this example node 1,2,3,4 will be node of subgraph(A) instead of subgraph(B1) and subgraph(B2) after parsing

[timotheeguerin]

I corrected this bug. Here is the dot2ruby.g file i edited
I added 3 function for getting the right parent graph

// Copyright (c) 2010 Gregoire Lejeune <gregoire.lejeune@free.fr>
// 
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
// 
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
// 
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
//
// Usage :
//   gvpr -f dot2ruby.g [-a <output type>] <dot script>

BEGIN {
  int g_strict; int g_direct;
  graph_t cluster;
  node_t cnode;
  edge_t cedge;
  string attr; string attrv;
  graph_t subgraph; graph_t pgraph;
  graph_t ofgraph;

  string xOut;
  if( ARGC == 0 ) {
    xOut = "_";
  } else {
    xOut = tolower(ARGV[0]);
  }

  printf( "# This code was generated by dot2ruby.g\n\n" );

  string rubyfy( string s ) {
    string out;
    out = tolower( s );
    out = gsub( out, "[!a-zA-Z0-9_]", "_" );
    return( out );
  }

  string stringify( string s ) {
    string sout;
    sout = gsub(s, "\"", "\\\"");
    sout = gsub(sout, "@", "\\@");
    sout = gsub(sout, "$", "\\$");
    return( sout );
  }

  void load_sub_graph( graph_t p ) {
    if(p == NULL) {
      return;
    }
    graph_t sub_graph;
    sub_graph = fstsubg(p);
    while( sub_graph != NULL ) {
      pgraph = sub_graph.parent;
      printf ( "  graph_%s = graph_%s.add_graph( \"%s\" )\n", rubyfy(sub_graph.name), rubyfy(pgraph.name), rubyfy(sub_graph.name) );

      // ATTRS
      attr = fstAttr(sub_graph, "G");
      while( attr != "" ) {
        attrv = aget( sub_graph, attr );
        if( attrv != "" ) {
          printf( "  graph_%s[:%s] = '%s'\n", rubyfy(sub_graph.name), attr, attrv );
        }
        attr = nxtAttr( sub_graph, "G", attr );
      }
      graph_t tmp_g = sub_graph;
      load_sub_graph(sub_graph);
      sub_graph = nxtsubg( tmp_g );

    }
  }

  graph_t get_node_graph(node_t n, graph_t p) {
    graph_t sub_graph;
    sub_graph = fstsubg(p);
    while( sub_graph != NULL ) {
      if( isSubnode( sub_graph, n) != 0 ) {
        return get_node_graph(n, sub_graph);
      }    
      sub_graph = nxtsubg( sub_graph );
    }
    return p;
  }

  graph_t get_edge_graph(edge_t e, graph_t p) {
    graph_t sub_graph;
    sub_graph = fstsubg(p);
    while( sub_graph != NULL ) {
      if( isSubedge( sub_graph, e) != 0 ) {      
        return get_edge_graph(e, sub_graph);
      }    
      sub_graph = nxtsubg( sub_graph );
    }
    return p;
  }


}

BEG_G {
  printf( "require 'rubygems'\nrequire 'graphviz'\n");
  // Directed 
  g_direct = isDirect($);
  if( g_direct == 0 ) {
    printf( "graph_%s = GraphViz.graph( \"%s\"", rubyfy($.name), stringify($.name) );
  } else {
    printf( "graph_%s = GraphViz.digraph( \"%s\"", rubyfy($.name), stringify($.name) );
  }
  // Strict
  g_strict = isStrict($);
  if( g_strict != 0 ) {
    printf( ", :strict => true" );
  }
  printf( " ) { |graph_%s|\n", rubyfy($.name) );

  // Attributs of G
  attr = fstAttr($, "G");
  while( attr != "" ) {
    attrv = aget( $, attr );
    if( attrv != "" ) {
      printf( "  graph_%s[:%s] = '%s'\n", rubyfy($.name), attr, attrv );
    }
    attr = nxtAttr( $, "G", attr );
  }

  load_sub_graph($);
}

N {
  pgraph = $.root;
  ofgraph = get_node_graph($, pgraph);

  printf( "  node_%s = graph_%s.add_nodes( \"%s\"", rubyfy($.name), rubyfy(ofgraph.name), stringify($.name) );

  // Attributs of N
    attr = fstAttr($G, "N");
    while( attr != "" ) {
      attrv = aget( $, attr );
      if( attrv != "" ) {
        printf( ", :%s => '%s'", attr, gsub( attrv, "'", "\\'" ) );
      } else {
        printf( ", :%s => ''", attr );
      }
      attr = nxtAttr( $G, "N", attr );
    }

    printf( " )\n");
  }

E {
   pgraph = $.root;
    ofgraph = get_edge_graph($, $.root);  

  printf( "  graph_%s.add_edges( \"%s\", \"%s\"", rubyfy(ofgraph.name), stringify($.tail.name), stringify($.head.name) );

// Attributs of E
    attr = fstAttr($G, "E");
    while( attr != "" ) {
      attrv = aget( $, attr );
      if( attrv != "" ) {
        printf( ", :%s => '%s'", attr, gsub( attrv, "'", "\\'" ) );
      } else {
        printf( ", :%s => ''", attr );
      }
      attr = nxtAttr( $G, "E", attr );
    }

    printf( " )\n" );
  }

END_G {
  printf( "}\n" );
  if( xOut != "_" ) {
    if( xOut == "-" ) {
      printf( "@_graph_eval = graph_%s\n", rubyfy($.name) );
    } else {
  printf( "graph_%s.output( :%s => \"%s.%s\" )\n", rubyfy($.name), xOut, gsub($F, ".*/", ""), xOut );
    }
  }
}

[glejeune]

@Timcolonel could you send a pull request ?

[glejeune]

Done - commit 4add3ce