* Don't only print out reachable nodes in the graph.

  * use new api to get all nodes in the graph
  * Allow custom graph traits

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4109 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/Support/GraphWriter.h b/include/Support/GraphWriter.h
index 7742aff40e8d6a266b281a917e9237a191023c94..fadff105362d4a768381b0217c8df8dcaea74315 100644 (file)
--- a/include/Support/GraphWriter.h
+++ b/include/Support/GraphWriter.h
@@ -17,7 +17,7 @@
 #define SUPPORT_GRAPHWRITER_H
 
 #include "Support/DOTGraphTraits.h"
-#include "Support/DepthFirstIterator.h"
+#include "Support/GraphTraits.h"
 #include <ostream>
 
 namespace DOT {  // Private functions...
@@ -53,19 +53,19 @@ std::ostream &WriteGraph(std::ostream &O, const GraphType &G) {
   typedef DOTGraphTraits<GraphType>  DOTTraits;
   typedef GraphTraits<GraphType>     GTraits;
   typedef typename GTraits::NodeType NodeType;
+  typedef typename GTraits::nodes_iterator node_iterator;
 
-  O << "digraph foo {\n"         // Graph name doesn't matter
-    << "\tsize=\"7.5,10\";\n";   // Size to fit on a page
-
+  O << "digraph foo {\n";        // Graph name doesn't matter
   std::string GraphName = DOTTraits::getGraphName(G);
   if (!GraphName.empty())
     O << "\tlabel=\"" << DOT::EscapeString(GraphName) << "\";\n";
+  O << DOTTraits::getGraphProperties(G);
   O << "\n";
 
   // Loop over the graph in DFO, printing it out...
-  NodeType *Root = GTraits::getEntryNode(G);
-  for (df_iterator<GraphType> I = df_begin(G), E = df_end(G); I != E; ++I) {
-    NodeType *Node = *I;
+  for (node_iterator I = GTraits::nodes_begin(G), E = GTraits::nodes_end(G);
+       I != E; ++I) {
+    NodeType *Node = &*I;
 
     std::string NodeAttributes = DOTTraits::getNodeAttributes(Node);
 

diff --git a/include/llvm/Support/GraphWriter.h b/include/llvm/Support/GraphWriter.h
index 7742aff40e8d6a266b281a917e9237a191023c94..fadff105362d4a768381b0217c8df8dcaea74315 100644 (file)
--- a/include/llvm/Support/GraphWriter.h
+++ b/include/llvm/Support/GraphWriter.h
@@ -17,7 +17,7 @@
 #define SUPPORT_GRAPHWRITER_H
 
 #include "Support/DOTGraphTraits.h"
-#include "Support/DepthFirstIterator.h"
+#include "Support/GraphTraits.h"
 #include <ostream>
 
 namespace DOT {  // Private functions...
@@ -53,19 +53,19 @@ std::ostream &WriteGraph(std::ostream &O, const GraphType &G) {
   typedef DOTGraphTraits<GraphType>  DOTTraits;
   typedef GraphTraits<GraphType>     GTraits;
   typedef typename GTraits::NodeType NodeType;
+  typedef typename GTraits::nodes_iterator node_iterator;
 
-  O << "digraph foo {\n"         // Graph name doesn't matter
-    << "\tsize=\"7.5,10\";\n";   // Size to fit on a page
-
+  O << "digraph foo {\n";        // Graph name doesn't matter
   std::string GraphName = DOTTraits::getGraphName(G);
   if (!GraphName.empty())
     O << "\tlabel=\"" << DOT::EscapeString(GraphName) << "\";\n";
+  O << DOTTraits::getGraphProperties(G);
   O << "\n";
 
   // Loop over the graph in DFO, printing it out...
-  NodeType *Root = GTraits::getEntryNode(G);
-  for (df_iterator<GraphType> I = df_begin(G), E = df_end(G); I != E; ++I) {
-    NodeType *Node = *I;
+  for (node_iterator I = GTraits::nodes_begin(G), E = GTraits::nodes_end(G);
+       I != E; ++I) {
+    NodeType *Node = &*I;
 
     std::string NodeAttributes = DOTTraits::getNodeAttributes(Node);