Changeset 1852:ffa7c6e96330 in lemon-0.x for lemon/bits/item_reader.h

Timestamp:

12/07/05 12:57:30 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2420

Message:

Some bug fixes and improvments in the io classes

File:

• lemon/bits/item_reader.h (modified) (6 diffs)

lemon/bits/item_reader.h

@@ -181 +181 @@
   public:
 
+    /// \brief Constructor for InsertReader
+    ///
+    /// Constructor for InsertReader
+    PushBackReader(const ItemReader& _item_reader = ItemReader())
+      : item_reader(_item_reader) {}
+
     /// \brief Reads the values into the container from the given stream.
     ///
@@ -195 +201 @@
       }
       if (!is) throw DataFormatError("PushBackReader format error");
-      is.putback(c);
     }
 
@@ -223 +228 @@
 
   public:
+
+    /// \brief Constructor for InsertReader
+    ///
+    /// Constructor for InsertReader
+    InsertReader(const ItemReader& _item_reader = ItemReader())
+      : item_reader(_item_reader) {}
 
     /// \brief Reads the values into the container from the given stream.
@@ -238 +249 @@
       }
       if (!is) throw DataFormatError("PushBackReader format error");
-      is.putback(c);
     }
 
@@ -311 +321 @@
     ///
     /// Reads the line from the given stream.
-    void read(std::istream& is, Value& value) {
+    void read(std::istream& is, Value& value) const {
       if (skipSpaces) is >> std::ws;
       if (!getline(is, value)) {
-        throw DataFormatError("LineReader forma error");
+        throw DataFormatError("LineReader format error");
       }
     }
   private:
     bool skipSpaces;
+  };
+
+  /// \ingroup item_io
+  /// \brief Reader for std::pair.
+  ///
+  /// Reader for std::pair.
+  ///
+  /// \author Balazs Dezso
+  template <typename _Pair, 
+            typename _FirstReader = 
+            DefaultReader<typename _Pair::first_type>,
+            typename _SecondReader = 
+            DefaultReader<typename _Pair::second_type> >
+  class PairReader {
+  public:
+    typedef _Pair Value;
+
+    typedef _FirstReader FirstReader;
+    typedef _SecondReader SecondReader;
+
+  private:
+
+    FirstReader first_reader;
+    SecondReader second_reader;
+
+  public:
+    
+    /// \brief Constructor.
+    ///
+    /// Constructor for the PairReader.
+    PairReader(const FirstReader& _first_reader = FirstReader(), 
+               const SecondReader& _second_reader = SecondReader()) 
+      : first_reader(_first_reader), second_reader(_second_reader) {}
+    
+    /// \brief Reads the pair from the given stream.
+    ///
+    /// Reads the pair from the given stream.
+    void read(std::istream& is, Value& value) const {
+      char c;
+      if (!(is >> c) || c != '(') {
+        throw DataFormatError("PairReader format error");
+      }
+      first_reader.read(is, value.first);
+      if (!(is >> c) || c != '=') {
+        throw DataFormatError("PairReader format error");
+      }
+      if (!(is >> c) || c != '>') {
+        throw DataFormatError("PairReader format error");
+      }
+      second_reader.read(is, value.second);
+      if (!(is >> c) || c != ')') {
+        throw DataFormatError("PairReader format error");
+      }
+    }
   };
 
@@ -390 +454 @@
     : public InsertReader<std::set<Item> > {};
 
+  template <typename Key, typename Value>
+  class DefaultReader<std::map<Key, Value> > 
+    : public InsertReader<std::map<Key, Value>,
+                          DefaultReader<std::pair<Key, Value> > > {};
+
   template <typename Item>
   class DefaultReader<std::multiset<Item> > 
     : public InsertReader<std::multiset<Item> > {};
 
+  template <typename Key, typename Value>
+  class DefaultReader<std::multimap<Key, Value> > 
+    : public InsertReader<std::multimap<Key, Value>,
+                          DefaultReader<std::pair<Key, Value> > > {};
+
+  template <typename First, typename Second>
+  class DefaultReader<std::pair<First, Second> > 
+    : public PairReader<std::pair<First, Second> > {};
+
   /// \ingroup item_io
   ///