Synchronize graphviz support with boost 1.40

configure.ac

@@ -165,6 +165,10 @@ AX_BOOST_IOSTREAMS
 if test "$BOOST_IOSTREAMS_LIB" = ""; then
    AC_MSG_ERROR([No usable boost::iostreams found])
 fi
+AX_BOOST_REGEX
+if test "$BOOST_REGEX_LIB" = ""; then
+   AC_MSG_ERROR([No usable boost::regex found])
+fi
 [CPPFLAGS="${CPPFLAGS} ${BOOST_CPPFLAGS}"]
 
 dnl Checks for header files.
@@ -272,7 +276,7 @@ AC_SUBST(MOD_DIR)
 
 # default LIBADD flags for submodules
 [MOD_LIBADD="${PYTHON_LDFLAGS} ${BOOST_IOSTREAMS_LIB} -l${BOOST_PYTHON_LIB} \
-${OPENMP_LDFLAGS} -lexpat"]
+${BOOST_REGEX_LIB} ${OPENMP_LDFLAGS} -lexpat"]
 AC_SUBST(MOD_LIBADD)
 
 # needed for typeinfo objects to work across DSO boundaries.

m4/ax_boost_regex.m4

+# ===========================================================================
+#         http://www.nongnu.org/autoconf-archive/ax_boost_regex.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_BOOST_REGEX
+#
+# DESCRIPTION
+#
+#   Test for Regex library from the Boost C++ libraries. The macro requires
+#   a preceding call to AX_BOOST_BASE. Further documentation is available at
+#   <http://randspringer.de/boost/index.html>.
+#
+#   This macro calls:
+#
+#     AC_SUBST(BOOST_REGEX_LIB)
+#
+#   And sets:
+#
+#     HAVE_BOOST_REGEX
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
+#   Copyright (c) 2008 Michael Tindal
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.
+
+AC_DEFUN([AX_BOOST_REGEX],
+[
+	AC_ARG_WITH([boost-regex],
+	AS_HELP_STRING([--with-boost-regex@<:@=special-lib@:>@],
+                   [use the Regex library from boost - it is possible to specify a certain library for the linker
+                        e.g. --with-boost-regex=boost_regex-gcc-mt-d-1_33_1 ]),
+        [
+        if test "$withval" = "no"; then
+			want_boost="no"
+        elif test "$withval" = "yes"; then
+            want_boost="yes"
+            ax_boost_user_regex_lib=""
+        else
+		    want_boost="yes"
+        	ax_boost_user_regex_lib="$withval"
+		fi
+        ],
+        [want_boost="yes"]
+	)
+
+	if test "x$want_boost" = "xyes"; then
+        AC_REQUIRE([AC_PROG_CC])
+		CPPFLAGS_SAVED="$CPPFLAGS"
+		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+		export CPPFLAGS
+
+		LDFLAGS_SAVED="$LDFLAGS"
+		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+		export LDFLAGS
+
+        AC_CACHE_CHECK(whether the Boost::Regex library is available,
+					   ax_cv_boost_regex,
+        [AC_LANG_PUSH([C++])
+			 AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/regex.hpp>
+												]],
+                                   [[boost::regex r(); return 0;]]),
+                   ax_cv_boost_regex=yes, ax_cv_boost_regex=no)
+         AC_LANG_POP([C++])
+		])
+		if test "x$ax_cv_boost_regex" = "xyes"; then
+			AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available])
+            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+            if test "x$ax_boost_user_regex_lib" = "x"; then
+                for libextension in `ls $BOOSTLIBDIR/libboost_regex*.{so,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_regex.*\)\.so.*$;\1;' -e 's;^lib\(boost_regex.*\)\.a*$;\1;'` ; do
+                     ax_lib=${libextension}
+				    AC_CHECK_LIB($ax_lib, exit,
+                                 [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
+                                 [link_regex="no"])
+  				done
+                if test "x$link_regex" != "xyes"; then
+                for libextension in `ls $BOOSTLIBDIR/boost_regex*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a*$;\1;'` ; do
+                     ax_lib=${libextension}
+				    AC_CHECK_LIB($ax_lib, exit,
+                                 [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
+                                 [link_regex="no"])
+  				done
+                fi
+
+            else
+               for ax_lib in $ax_boost_user_regex_lib boost_regex-$ax_boost_user_regex_lib; do
+				      AC_CHECK_LIB($ax_lib, main,
+                                   [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
+                                   [link_regex="no"])
+               done
+            fi
+			if test "x$link_regex" != "xyes"; then
+				AC_MSG_ERROR(Could not link against $ax_lib !)
+			fi
+		fi
+
+		CPPFLAGS="$CPPFLAGS_SAVED"
+    	LDFLAGS="$LDFLAGS_SAVED"
+	fi
+])

src/boost-workaround/boost/graph/detail/read_graphviz_new.hpp

+// Copyright 2004-9 Trustees of Indiana University
+
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//
+// read_graphviz_new.hpp - 
+//   Initialize a model of the BGL's MutableGraph concept and an associated
+//  collection of property maps using a graph expressed in the GraphViz
+// DOT Language.  
+//
+//   Based on the grammar found at:
+//   http://www.graphviz.org/cvs/doc/info/lang.html
+//
+//   Jeremiah rewrite used grammar found at:
+//   http://www.graphviz.org/doc/info/lang.html
+//   and page 34 or http://www.graphviz.org/pdf/dotguide.pdf
+//
+//   See documentation for this code at: 
+//     http://www.boost.org/libs/graph/doc/read-graphviz.html
+//
+
+// Author: Jeremiah Willcock
+//         Ronald Garcia
+//
+
+#ifndef BOOST_READ_GRAPHVIZ_NEW_HPP
+#define BOOST_READ_GRAPHVIZ_NEW_HPP
+
+#include <boost/ref.hpp>
+#include <boost/dynamic_property_map.hpp>
+#include <boost/graph/graph_traits.hpp>
+#include <boost/detail/workaround.hpp>
+#include <algorithm>
+#include <string>
+#include <vector>
+#include <set>
+#include <utility>
+#include <map>
+#include <iostream>
+#include <cstdlib>
+
+namespace boost {
+
+namespace read_graphviz_detail {
+  typedef std::string node_name;
+  typedef std::string subgraph_name;
+
+  typedef std::map<std::string, std::string> properties;
+
+  struct node_and_port {
+    node_name name;
+    std::string angle; // Or empty if no angle
+    std::vector<std::string> location; // Up to two identifiers
+
+    friend inline bool operator==(const node_and_port& a, const node_and_port& b) {
+      return a.name == b.name &&
+             a.angle == b.angle &&
+             a.location == b.location;
+    }
+
+    friend inline bool operator<(const node_and_port& a, const node_and_port& b) {
+      if (a.name != b.name) return a.name < b.name;
+      if (a.angle != b.angle) return a.angle < b.angle;
+      return a.location < b.location;
+    }
+  };
+
+  struct edge_info {
+    node_and_port source;
+    node_and_port target;
+    properties props;
+  };
+
+  struct parser_result {
+    bool graph_is_directed;
+    bool graph_is_strict;
+    std::map<node_name, properties> nodes; // Global set
+    std::vector<edge_info> edges;
+    std::map<subgraph_name, properties> graph_props; // Root and subgraphs
+  };
+
+  // The actual parser, from libs/graph/src/read_graphviz_new.cpp
+  void parse_graphviz_from_string(const std::string& str, parser_result& result, bool want_directed);
+
+  // Translate from those results to a graph
+  void translate_results_to_graph(const parser_result& r, ::boost::detail::graph::mutate_graph* mg);
+
+} // namespace read_graphviz_detail
+
+// This is also in boost/graph/graphviz.hpp
+namespace detail {
+  namespace graph {
+    BOOST_GRAPH_DECL bool read_graphviz(const std::string& str, boost::detail::graph::mutate_graph* mg);
+  } // end namespace graph
+} // end namespace detail
+
+template <typename MutableGraph>
+bool read_graphviz(const std::string& str,
+                   MutableGraph& graph, boost::dynamic_properties& dp,
+                   std::string const& node_id = "node_id") {
+  boost::detail::graph::mutate_graph_impl<MutableGraph> mg(graph, dp, node_id);
+  return detail::graph::read_graphviz(str, &mg);
+}
+
+template <typename InputIter, typename MutableGraph>
+bool read_graphviz(InputIter begin, InputIter end,
+                   MutableGraph& graph, boost::dynamic_properties& dp,
+                   std::string const& node_id = "node_id") {
+  return read_graphviz(std::string(begin, end), graph, dp, node_id);
+}
+
+} // namespace boost
+
+#endif // BOOST_READ_GRAPHVIZ_NEW_HPP

src/boost-workaround/boost/graph/detail/read_graphviz_spirit.hpp

+// Copyright 2004-9 Trustees of Indiana University
+
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//
+// read_graphviz_spirit.hpp - 
+//   Initialize a model of the BGL's MutableGraph concept and an associated
+//  collection of property maps using a graph expressed in the GraphViz
+// DOT Language.  
+//
+//   Based on the grammar found at:
+//   http://www.graphviz.org/cvs/doc/info/lang.html
+//
+//   See documentation for this code at: 
+//     http://www.boost.org/libs/graph/doc/read-graphviz.html
+//
+
+// Author: Ronald Garcia
+//
+
+#ifndef BOOST_READ_GRAPHVIZ_SPIRIT_HPP
+#define BOOST_READ_GRAPHVIZ_SPIRIT_HPP
+
+// Phoenix/Spirit set these limits to 3, but I need more.
+#define PHOENIX_LIMIT 6
+#define BOOST_SPIRIT_CLOSURE_LIMIT 6
+
+
+#include <boost/spirit/include/classic_multi_pass.hpp>
+#include <boost/spirit/include/classic_core.hpp>
+#include <boost/spirit/include/classic_confix.hpp>
+#include <boost/spirit/include/classic_distinct.hpp>
+#include <boost/spirit/include/classic_lists.hpp>
+#include <boost/spirit/include/classic_escape_char.hpp>
+#include <boost/spirit/include/classic_attribute.hpp>
+#include <boost/spirit/include/classic_dynamic.hpp>
+#include <boost/spirit/include/classic_actor.hpp>
+#include <boost/spirit/include/classic_closure.hpp>
+#include <boost/spirit/include/phoenix1.hpp>
+#include <boost/spirit/include/phoenix1_binders.hpp>
+#include <boost/ref.hpp>
+#include <boost/function/function2.hpp>
+#include <boost/type_traits/is_same.hpp>
+#include <boost/dynamic_property_map.hpp>
+#include <boost/graph/graph_traits.hpp>
+#include <boost/detail/workaround.hpp>
+#include <algorithm>
+#include <exception> // for std::exception
+#include <string>
+#include <vector>
+#include <set>
+#include <utility>
+#include <map>
+#include <boost/graph/graphviz.hpp>
+#include <boost/throw_exception.hpp>
+
+namespace phoenix {
+// Workaround:  std::map::operator[] uses a different return type than all
+// other standard containers.  Phoenix doesn't account for that.
+template <typename TK, typename T0, typename T1>
+struct binary_operator<index_op, std::map<TK,T0>, T1>
+{
+    typedef typename std::map<TK,T0>::mapped_type& result_type;
+    static result_type eval(std::map<TK,T0>& container, T1 const& index)
+    { return container[index]; }
+};
+} // namespace phoenix
+
+namespace boost {
+namespace detail {
+namespace graph {
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Application-specific type definitions
+/////////////////////////////////////////////////////////////////////////////
+
+typedef std::set<edge_t> edges_t;
+typedef std::set<node_t> nodes_t;
+typedef std::set<id_t> ids_t;
+typedef std::map<edge_t,ids_t> edge_map_t;
+typedef std::map<node_t,ids_t> node_map_t;
+typedef std::map<id_t,id_t> props_t;
+typedef std::map<id_t,props_t> subgraph_props_t;
+typedef boost::function2<void, id_t const&, id_t const&> actor_t;
+typedef std::vector<edge_t> edge_stack_t;
+typedef std::map<id_t,nodes_t> subgraph_nodes_t;
+typedef std::map<id_t,edges_t> subgraph_edges_t;
+
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Stack frames used by semantic actions
+/////////////////////////////////////////////////////////////////////////////
+struct id_closure : boost::spirit::classic::closure<id_closure, node_t> {
+  member1 name;
+};
+
+
+struct node_id_closure : boost::spirit::classic::closure<node_id_closure, node_t> {
+  member1 name;
+};
+
+struct attr_list_closure : boost::spirit::classic::closure<attr_list_closure, actor_t> {
+  member1 prop_actor;
+};
+
+struct property_closure : boost::spirit::classic::closure<property_closure, id_t, id_t> {
+  member1 key;
+  member2 value;
+};
+
+struct data_stmt_closure : boost::spirit::classic::closure<data_stmt_closure,
+                           nodes_t,nodes_t,edge_stack_t,bool,node_t> {
+  member1 sources;
+  member2 dests;
+  member3 edge_stack;
+  member4 saw_node;
+  member5 active_node;
+};
+
+struct subgraph_closure : boost::spirit::classic::closure<subgraph_closure,
+                          nodes_t, edges_t, node_t> {
+  member1 nodes;
+  member2 edges;
+  member3 name;
+};
+
+/////////////////////////////////////////////////////////////////////////////
+// Grammar and Actions for the DOT Language
+/////////////////////////////////////////////////////////////////////////////
+
+// Grammar for a dot file.
+struct dot_grammar : public boost::spirit::classic::grammar<dot_grammar> { 
+  mutate_graph& graph_;
+  explicit dot_grammar(mutate_graph& graph) : graph_(graph) { }
+
+  template <class ScannerT>
+  struct definition {
+   
+    definition(dot_grammar const& self) : self(self), subgraph_depth(0),
+    keyword_p("0-9a-zA-Z_") {
+      using namespace boost::spirit::classic;
+      using namespace phoenix;
+      
+      // RG - Future Work
+      // - Handle multi-line strings using \ line continuation
+      // - Make keywords case insensitive
+      ID 
+          = ( lexeme_d[((alpha_p | ch_p('_')) >> *(alnum_p | ch_p('_')))]
+            | real_p
+            | lexeme_d[confix_p('"', *c_escape_ch_p, '"')]
+            | comment_nest_p('<', '>')
+            )[ID.name = construct_<std::string>(arg1,arg2)]
+          ; 
+
+      a_list
+          = list_p( ID[(a_list.key = arg1),
+                       (a_list.value = "true")
+                      ]
+                    >> !( ch_p('=')
+                          >> ID[a_list.value = arg1])
+                          [phoenix::bind(&definition::call_prop_actor)
+                          (var(*this),a_list.key,a_list.value)],!ch_p(','));
+      
+      attr_list = +(ch_p('[') >> !a_list >> ch_p(']'));
+
+      // RG - disregard port id's for now.
+      port_location 
+          = (ch_p(':') >> ID)
+          | (ch_p(':') >> ch_p('(') >> ID >> ch_p(',') >> ID >> ch_p(')'))
+          ;
+
+      port_angle = ch_p('@') >> ID;
+
+      port
+          = port_location >> (!port_angle)
+          | port_angle >> (!port_location);
+
+
+      node_id
+          = ( ID[node_id.name = arg1] >> (!port) )
+             [phoenix::bind(&definition::memoize_node)(var(*this))];
+
+      graph_stmt
+          = (ID[graph_stmt.key = arg1] >>
+             ch_p('=') >>
+             ID[graph_stmt.value = arg1])
+        [phoenix::bind(&definition::call_graph_prop)
+         (var(*this),graph_stmt.key,graph_stmt.value)]
+        ; // Graph property.
+
+      attr_stmt
+          = (as_lower_d[keyword_p("graph")]
+             >> attr_list(actor_t(phoenix::bind(&definition::default_graph_prop)
+                                     (var(*this),arg1,arg2))))
+          | (as_lower_d[keyword_p("node")]
+             >> attr_list(actor_t(phoenix::bind(&definition::default_node_prop)
+                                     (var(*this),arg1,arg2))))
+          | (as_lower_d[keyword_p("edge")]
+             >> attr_list(actor_t(phoenix::bind(&definition::default_edge_prop)
+                                     (var(*this),arg1,arg2))))
+          ;
+
+      // edge_head is set depending on the graph type (directed/undirected)
+      edgeop = ch_p('-') >> ch_p(boost::ref(edge_head));
+
+      edgeRHS
+          =  +(    edgeop[(data_stmt.sources = data_stmt.dests),
+                          (data_stmt.dests = construct_<nodes_t>())]
+                   >> ( subgraph[data_stmt.dests = arg1]
+                      | node_id[phoenix::bind(&definition::insert_node)
+                                (var(*this),data_stmt.dests,arg1)]
+                      )
+                   [phoenix::bind(&definition::activate_edge)
+                    (var(*this),data_stmt.sources,data_stmt.dests,
+                     var(edges), var(default_edge_props))]
+              );
+      
+
+      // To avoid backtracking, edge, node, and subgraph statements are
+      // processed as one nonterminal.
+      data_stmt
+          = ( subgraph[(data_stmt.dests = arg1),// will get moved in rhs
+                       (data_stmt.saw_node = false)] 
+            | node_id[(phoenix::bind(&definition::insert_node)
+                       (var(*this),data_stmt.dests,arg1)),
+                      (data_stmt.saw_node = true),
+#ifdef BOOST_GRAPH_DEBUG
+                      (std::cout << val("AcTive Node: ") << arg1 << "\n"),
+#endif // BOOST_GRAPH_DEBUG
+                      (data_stmt.active_node = arg1)]
+            ) >> if_p(edgeRHS)[
+                     !attr_list(
+                       actor_t(phoenix::bind(&definition::edge_prop)
+                               (var(*this),arg1,arg2)))
+                  ].else_p[
+                     if_p(data_stmt.saw_node)[
+                         !attr_list(
+                           actor_t(phoenix::bind(&definition::node_prop)
+                                   (var(*this),arg1,arg2)))
+                     ] // otherwise it's a subgraph, nothing more to do.
+                  ];
+
+
+      stmt
+          = graph_stmt 
+          | attr_stmt
+          | data_stmt
+          ;
+
+      stmt_list = *( stmt >> !ch_p(';') );
+
+      subgraph
+          = !(  as_lower_d[keyword_p("subgraph")]
+                >> (!ID[(subgraph.name = arg1), 
+                        (subgraph.nodes = (var(subgraph_nodes))[arg1]),
+                        (subgraph.edges = (var(subgraph_edges))[arg1])])
+                )
+          >> ch_p('{')[++var(subgraph_depth)]
+          >> stmt_list 
+          >> ch_p('}')[--var(subgraph_depth)]
+                      [(var(subgraph_nodes))[subgraph.name] = subgraph.nodes]
+                      [(var(subgraph_edges))[subgraph.name] = subgraph.edges]
+                     
+          | as_lower_d[keyword_p("subgraph")]
+                >> ID[(subgraph.nodes = (var(subgraph_nodes))[arg1]),
+                      (subgraph.edges = (var(subgraph_edges))[arg1])]
+          ;
+
+      the_grammar
+          = (!as_lower_d[keyword_p("strict")])
+            >>  ( as_lower_d[keyword_p("graph")][
+                   (var(edge_head) = '-'),
+                   (phoenix::bind(&definition::check_undirected)(var(*this)))]
+                | as_lower_d[keyword_p("digraph")][
+                   (var(edge_head) = '>'),
+                   (phoenix::bind(&definition::check_directed)(var(*this)))]
+                )
+            >> (!ID) >> ch_p('{') >> stmt_list >> ch_p('}');
+
+    } // definition()
+
+    typedef boost::spirit::classic::rule<ScannerT> rule_t;
+
+    rule_t const& start() const { return the_grammar; }
+
+
+    //  
+    // Semantic actions
+    //
+
+    void check_undirected() {
+      if(self.graph_.is_directed())
+          boost::throw_exception(boost::undirected_graph_error());
+    }
+
+    void check_directed() {
+      if(!self.graph_.is_directed())
+          boost::throw_exception(boost::directed_graph_error());
+    }
+    
+    void memoize_node() {
+      id_t const& node = node_id.name();
+      props_t& node_props = default_node_props; 
+
+      if(nodes.find(node) == nodes.end()) {
+        nodes.insert(node);
+        self.graph_.do_add_vertex(node);
+
+        node_map.insert(std::make_pair(node,ids_t()));
+
+#ifdef BOOST_GRAPH_DEBUG
+        std::cout << "Add new node " << node << std::endl;
+#endif // BOOST_GRAPH_DEBUG
+        // Set the default properties for this edge
+        // RG: Here I  would actually set the properties
+        for(props_t::iterator i = node_props.begin();
+            i != node_props.end(); ++i) {
+          set_node_property(node,i->first,i->second);
+        }
+        if(subgraph_depth > 0) {
+          subgraph.nodes().insert(node);
+          // Set the subgraph's default properties as well
+          props_t& props = subgraph_node_props[subgraph.name()];
+          for(props_t::iterator i = props.begin(); i != props.end(); ++i) {
+            set_node_property(node,i->first,i->second);
+          }
+        }
+      } else {
+#ifdef BOOST_GRAPH_DEBUG
+        std::cout << "See node " << node << std::endl;
+#endif // BOOST_GRAPH_DEBUG
+      }
+    }
+
+    void activate_edge(nodes_t& sources, nodes_t& dests, edges_t& edges,
+                       props_t& edge_props) {
+      edge_stack_t& edge_stack = data_stmt.edge_stack();
+      for(nodes_t::iterator i = sources.begin(); i != sources.end(); ++i) {
+        for(nodes_t::iterator j = dests.begin(); j != dests.end(); ++j) {
+          // Create the edge and push onto the edge stack.
+#ifdef BOOST_GRAPH_DEBUG
+          std::cout << "Edge " << *i << " to " << *j << std::endl;
+#endif // BOOST_GRAPH_DEBUG
+
+          edge_t edge = edge_t::new_edge();
+          edge_stack.push_back(edge);
+          edges.insert(edge);
+          edge_map.insert(std::make_pair(edge,ids_t()));
+
+          // Add the real edge.
+          self.graph_.do_add_edge(edge, *i, *j);
+
+          // Set the default properties for this edge
+          for(props_t::iterator k = edge_props.begin();
+              k != edge_props.end(); ++k) {
+            set_edge_property(edge,k->first,k->second);
+          }
+          if(subgraph_depth > 0) {
+            subgraph.edges().insert(edge);
+            // Set the subgraph's default properties as well
+            props_t& props = subgraph_edge_props[subgraph.name()];
+            for(props_t::iterator k = props.begin(); k != props.end(); ++k) {
+              set_edge_property(edge,k->first,k->second);
+            }
+          }
+        }
+      }
+    }
+
+    // node_prop - Assign the property for the current active node.
+    void node_prop(id_t const& key, id_t const& value) {
+      node_t& active_object = data_stmt.active_node