Changeset 163:c82fd9568d75 in lemon

Timestamp:

05/31/08 12:31:21 (17 years ago)

Author:

Balazs Dezso <deba@…>

Branch:

default

Phase:

public

Message:

Bug fixes and improvements in LGF IO

Location:

lemon

Files:

• lgf_reader.h (modified) (5 diffs)
• lgf_writer.h (modified) (7 diffs)

lemon/lgf_reader.h

@@ -468 +468 @@
         _use_nodes(other._use_nodes), _use_arcs(other._use_arcs) {
 
-      other.is = 0;
+      other._is = 0;
       other.local_is = false;
       
@@ -1079 +1079 @@
     /// This function starts the batch processing
     void run() {
-      
       LEMON_ASSERT(_is != 0, "This reader assigned to an other reader");
+      if (!*_is) {
+        throw DataFormatError("Cannot find file");
+      }
       
       bool nodes_done = false;
@@ -1161 +1163 @@
   template <typename Digraph>
   DigraphReader<Digraph> digraphReader(std::istream& is, Digraph& digraph) {
-    return DigraphReader<Digraph>(is, digraph);
+    DigraphReader<Digraph> tmp(is, digraph);
+    return tmp;
   }
 
@@ -1168 +1171 @@
   DigraphReader<Digraph> digraphReader(const std::string& fn, 
                                        Digraph& digraph) {
-    return DigraphReader<Digraph>(fn, digraph);
+    DigraphReader<Digraph> tmp(fn, digraph);
+    return tmp;
   }
 
@@ -1174 +1178 @@
   template <typename Digraph>
   DigraphReader<Digraph> digraphReader(const char* fn, Digraph& digraph) {
-    return DigraphReader<Digraph>(fn, digraph);
+    DigraphReader<Digraph> tmp(fn, digraph);
+    return tmp;
   }
 }

lemon/lgf_writer.h

@@ -196 +196 @@
       default:
         if (c < 0x20) {
+          std::ios::fmtflags flags = os.flags();
           os << '\\' << std::oct << static_cast<int>(c);
+          os.flags(flags);
         } else {
           os << c;
@@ -244 +246 @@
   /// 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
-  /// the value type of the map to std::string. If it is set, it will
-  /// determine how the map's value type is written to the output
-  /// stream. If the functor is not set, then a default conversion
-  /// will be used. The \c attribute(), \c node() and \c arc() functions
-  /// are used to add attribute writing rules.
+  /// converter parameter can also be added as a standard functor
+  /// converting from the value type of the map to std::string. If it
+  /// is set, it will determine how the map's value type is written to
+  /// the output stream. If the functor is not set, then a default
+  /// conversion will be used. The \c attribute(), \c node() and \c
+  /// arc() functions are used to add attribute writing rules.
   ///
   ///\code
@@ -270 +272 @@
   ///
   /// The \c skipNodes() and \c skipArcs() functions forbid the
-  /// writing of the sections. If two arc sections should be written to the
-  /// output, it can be done in two passes, the first pass writes the
-  /// node section and the first arc section, then the second pass
-  /// skips the node section and writes just the arc section to the
-  /// stream. The output stream can be retrieved with the \c ostream()
-  /// function, hence the second pass can append its output to the output of the
-  /// first pass.
+  /// writing of the sections. If two arc sections should be written
+  /// to the output, it can be done in two passes, the first pass
+  /// writes the node section and the first arc section, then the
+  /// second pass skips the node section and writes just the arc
+  /// section to the stream. The output stream can be retrieved with
+  /// the \c ostream() function, hence the second pass can append its
+  /// output to the output of the first pass.
   template <typename _Digraph>
   class DigraphWriter {
@@ -350 +352 @@
         _skip_nodes(other._skip_nodes), _skip_arcs(other._skip_arcs) {
 
-      other.is = 0;
+      other._os = 0;
       other.local_os = false;
 
@@ -718 +720 @@
   /// \relates DigraphWriter
   template <typename Digraph>
-  DigraphWriter<Digraph> digraphWriter(std::istream& is, Digraph& digraph) {
-    return DigraphWriter<Digraph>(is, digraph);
+  DigraphWriter<Digraph> digraphWriter(std::ostream& os, Digraph& digraph) {
+    DigraphWriter<Digraph> tmp(os, digraph);
+    return tmp;
   }
 
@@ -726 +729 @@
   DigraphWriter<Digraph> digraphWriter(const std::string& fn, 
                                        Digraph& digraph) {
-    return DigraphWriter<Digraph>(fn, digraph);
+    DigraphWriter<Digraph> tmp(fn, digraph);
+    return tmp;
   }
 
@@ -732 +736 @@
   template <typename Digraph>
   DigraphWriter<Digraph> digraphWriter(const char* fn, Digraph& digraph) {
-    return DigraphWriter<Digraph>(fn, digraph);
+    DigraphWriter<Digraph> tmp(fn, digraph);
+    return tmp;
   }
 }