Changeset 163:c82fd9568d75 in lemon-1.2 for lemon/lgf_reader.h

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

File:

• lemon/lgf_reader.h (modified) (5 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;
   }
 }