lemon-main: comparison lemon/lgf

equal deleted inserted replaced

-:512d95c69100
+:3f179fd8d2bc
 case '\v':
 	os << "\\v";
 	return;
 default:
 	if (c < 0x20) {
+	  std::ios::fmtflags flags = os.flags();
 	  os << '\\' << std::oct << static_cast<int>(c);
+	  os.flags(flags);
 	} else {
 	  os << c;
 	}
 	return;
 }
 /// The writing method does a batch processing. The user creates a
 /// writer object, then various writing rules can be added to the
 /// writer, and eventually the writing is executed with the \c run()
 /// member function. A map writing rule can be added to the writer
 /// with the \c nodeMap() or \c arcMap() members. An optional
-/// converter parameter can also be added as a standard functor converting from
+/// converter parameter can also be added as a standard functor
-/// the value type of the map to std::string. If it is set, it will
+/// converting from the value type of the map to std::string. If it
-/// determine how the map's value type is written to the output
+/// is set, it will determine how the map's value type is written to
-/// stream. If the functor is not set, then a default conversion
+/// the output stream. If the functor is not set, then a default
-/// will be used. The \c attribute(), \c node() and \c arc() functions
+/// conversion will be used. The \c attribute(), \c node() and \c
-/// are used to add attribute writing rules.
+/// arc() functions are used to add attribute writing rules.
 ///
 ///\code
 ///     DigraphWriter<Digraph>(std::cout, digraph).
 ///       nodeMap("coordinates", coord_map).
 ///       nodeMap("size", size).
 /// sections, but they can be give as an optional parameter of
 /// the \c nodes(), \c arcs() or \c
 /// attributes() functions.
 ///
 /// The \c skipNodes() and \c skipArcs() functions forbid the
-/// writing of the sections. If two arc sections should be written to the
+/// writing of the sections. If two arc sections should be written
-/// output, it can be done in two passes, the first pass writes the
+/// to the output, it can be done in two passes, the first pass
-/// node section and the first arc section, then the second pass
+/// writes the node section and the first arc section, then the
-/// skips the node section and writes just the arc section to the
+/// second pass skips the node section and writes just the arc
-/// stream. The output stream can be retrieved with the \c ostream()
+/// section to the stream. The output stream can be retrieved with
-/// function, hence the second pass can append its output to the output of the
+/// the \c ostream() function, hence the second pass can append its
-/// first pass.
+/// output to the output of the first pass.
 template <typename _Digraph>
 class DigraphWriter {
 public:
 typedef _Digraph Digraph;
 /// therefore the copied writer will not be usable more.
 DigraphWriter(DigraphWriter& other)
 : _os(other._os), local_os(other.local_os), _digraph(other._digraph),
 	_skip_nodes(other._skip_nodes), _skip_arcs(other._skip_arcs) {
-other.is = 0;
+other._os = 0;
 other.local_os = false;
 _node_index.swap(other._node_index);
 _arc_index.swap(other._arc_index);
 /// @}
 };
 /// \relates DigraphWriter
 template <typename Digraph>
-DigraphWriter<Digraph> digraphWriter(std::istream& is, Digraph& digraph) {
+DigraphWriter<Digraph> digraphWriter(std::ostream& os, Digraph& digraph) {
-return DigraphWriter<Digraph>(is, digraph);
+DigraphWriter<Digraph> tmp(os, digraph);
+return tmp;
 }
 /// \relates DigraphWriter
 template <typename Digraph>
 DigraphWriter<Digraph> digraphWriter(const std::string& fn,
 				       Digraph& digraph) {
-return DigraphWriter<Digraph>(fn, digraph);
+DigraphWriter<Digraph> tmp(fn, digraph);
+return tmp;
 }
 /// \relates DigraphWriter
 template <typename Digraph>
 DigraphWriter<Digraph> digraphWriter(const char* fn, Digraph& digraph) {
-return DigraphWriter<Digraph>(fn, digraph);
+DigraphWriter<Digraph> tmp(fn, digraph);
+return tmp;
 }
 }
 #endif

changeset 163	c82fd9568d75
parent 156	e561aa7675de
child 165	b4c336c27a03