lemon-0.x: comparison lemon/bits/item

equal deleted inserted replaced

-:b1584baeb800
+:fff208e4dd73
 ItemReader item_reader;
 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.
 ///
 /// Reads the values into the container from the given stream.
 void read(std::istream& is, Value& value) const {
 char c;
 	typename ItemReader::Value item;
 	item_reader.read(is, item);
 	value.push_back(item);
 }
 if (!is) throw DataFormatError("PushBackReader format error");
-is.putback(c);
 }
 };
 /// \ingroup item_io
 private:
 ItemReader item_reader;
 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.
 ///
 /// Reads the values into the container from the given stream.
 void read(std::istream& is, Value& value) const {
 	typename ItemReader::Value item;
 	item_reader.read(is, item);
 	value.insert(item);
 }
 if (!is) throw DataFormatError("PushBackReader format error");
-is.putback(c);
 }
 };
 /// \ingroup item_io
 LineReader(bool _skipSpaces = true) : skipSpaces(_skipSpaces) {}
 /// \brief Reads the line from the given stream.
 ///
 /// 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");
+}
+}
 };
 /// \ingroup item_io
 ///
 /// \brief The default item reader template class.
 template <typename Item>
 class DefaultReader<std::set<Item> >
 : 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
 ///
 /// \brief The default item reader for skipping a value in the stream.
 ///
 /// The default item reader for skipping a value in the stream.

changeset 1869	52f5a7f9fb48
parent 1744	51d5d41e15b1
child 1875	98698b69a902