Update of /cvsroot/boost/boost/boost/graph/detail
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2217

Modified Files:
        read_graphviz_spirit.hpp 
Log Message:
Squashed some bugs: attribute list commas are optional.  '#' was not
behaving properly (especially inside quoted strings).


Index: read_graphviz_spirit.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/graph/detail/read_graphviz_spirit.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- read_graphviz_spirit.hpp    19 Oct 2006 21:46:00 -0000      1.17
+++ read_graphviz_spirit.hpp    19 Oct 2006 23:37:01 -0000      1.18
@@ -161,7 +161,7 @@
                     >> !( ch_p('=')
                           >> ID[a_list.value = arg1])
                           [phoenix::bind(&definition::call_prop_actor)
-                          (var(*this),a_list.key,a_list.value)],ch_p(','));
+                          (var(*this),a_list.key,a_list.value)],!ch_p(','));
       
       attr_list = +(ch_p('[') >> !a_list >> ch_p(']'));
 
@@ -467,7 +467,11 @@
       self.graph_.set_edge_property(key, edge, value);
 #ifdef BOOST_GRAPH_DEBUG
       // Tell the world
-      std::cout << "(" << edge.first << "," << edge.second << "): "
+#if 0 // RG - edge representation changed, 
+            std::cout << "(" << edge.first << "," << edge.second << "): "
+#else
+            std::cout << "an edge: " 
+#endif // 0
                 << key << " = " << value << std::endl;
 #endif // BOOST_GRAPH_DEBUG
     }
@@ -541,9 +545,9 @@
           using namespace boost::spirit;
           using namespace phoenix;
           // comment forms
-          skip = space_p
+          skip = eol_p >> comment_p("#")  
+               | space_p
                | comment_p("//")                 
-               | comment_p("#")  
 #if BOOST_WORKAROUND(BOOST_MSVC, <= 1400)
                | confix_p(str_p("/*") ,*anychar_p, str_p("*/"))
 #else


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs

Reply via email to