lemon-0.x: comparison lemon/lemon

equal deleted inserted replaced

-:31bd93628ecd
+:da977104d16e
 	_eptr = buf + len;
 }
 virtual std::streambuf* setbuf(char *buf, std::streamsize len) {
 	if (base()) return 0;
-	if (buf != 0 && len >= (int)sizeof(small_buf)) {
+	if (buf != 0 && len >= int(sizeof(small_buf))) {
 	  setb(buf, len);
 	} else {
 	  setb(small_buf, sizeof(small_buf));
 	}
 	setg(0, 0, 0);
 	    if (it->first->header(line)) {
 it->second = true;
 	      char buf[2048];
 	      FilterStreamBuf buffer(*is, line_num);
 	      buffer.pubsetbuf(buf, sizeof(buf));
-	      std::istream is(&buffer);
+	      std::istream ss(&buffer);
-	      it->first->read(is);
+	      it->first->read(ss);
 	      break;
 	    }
 	  }
 	}
 for (it = readers.begin(); it != readers.end(); ++it) {
 /// \brief Add a new node map reader command for the reader.
 ///
 /// Add a new node map reader command for the reader.
 template <typename Map>
-NodeSetReader& readNodeMap(std::string name, Map& map) {
+NodeSetReader& readNodeMap(std::string label, Map& map) {
 return _readMap<
 	typename Traits::template Reader<typename Map::Value>, Map,
-	typename _reader_bits::Arg<Map>::Type>(name, map);
+	typename _reader_bits::Arg<Map>::Type>(label, map);
 }
 template <typename Map>
-NodeSetReader& readNodeMap(std::string name, const Map& map) {
+NodeSetReader& readNodeMap(std::string label, const Map& map) {
 return _readMap<
 	typename Traits::template Reader<typename Map::Value>, Map,
-	typename _reader_bits::Arg<Map>::Type>(name, map);
+	typename _reader_bits::Arg<Map>::Type>(label, map);
 }
 /// \brief Add a new node map reader command for the reader.
 ///
 /// Add a new node map reader command for the reader.
-template <typename Reader, typename Map>
+template <typename ItemReader, typename Map>
-NodeSetReader& readNodeMap(std::string name, Map& map,
+NodeSetReader& readNodeMap(std::string label, Map& map,
-			       const Reader& reader = Reader()) {
+			       const ItemReader& ir = ItemReader()) {
-return _readMap<Reader, Map, typename _reader_bits::Arg<Map>::Type>
+return _readMap<ItemReader, Map, typename _reader_bits::Arg<Map>::Type>
-	(name, map, reader);
+	(label, map, ir);
 }
-template <typename Reader, typename Map>
+template <typename ItemReader, typename Map>
-NodeSetReader& readNodeMap(std::string name, const Map& map,
+NodeSetReader& readNodeMap(std::string label, const Map& map,
-			       const Reader& reader = Reader()) {
+			       const ItemReader& ir = ItemReader()) {
-return _readMap<Reader, Map, typename _reader_bits::Arg<Map>::Type>
+return _readMap<ItemReader, Map, typename _reader_bits::Arg<Map>::Type>
-	(name, map, reader);
+	(label, map, ir);
 }
 private:
-template <typename Reader, typename Map, typename MapParameter>
+template <typename ItemReader, typename Map, typename MapParameter>
-NodeSetReader& _readMap(std::string name, MapParameter map,
+NodeSetReader& _readMap(std::string label, MapParameter map,
-			    const Reader& reader = Reader()) {
+			    const ItemReader& ir = ItemReader()) {
 checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
-checkConcept<_reader_bits::ItemReader<typename Map::Value>, Reader>();
+checkConcept<_reader_bits::ItemReader<typename Map::Value>, ItemReader>();
-if (readers.find(name) != readers.end()) {
+if (readers.find(label) != readers.end()) {
 	ErrorMessage msg;
-	msg << "Multiple read rule for node map: " << name;
+	msg << "Multiple read rule for node map: " << label;
 	throw IoParameterError(msg.message());
 }
 readers.insert(
-make_pair(name, new _reader_bits::
+make_pair(label, new _reader_bits::
-		  MapReader<Node, Map, Reader>(map, reader)));
+		  MapReader<Node, Map, ItemReader>(map, ir)));
 return *this;
 }
 public:
 /// \brief Add a new node map skipper command for the reader.
 ///
 /// Add a new node map skipper command for the reader.
-template <typename Reader>
+template <typename ItemReader>
-NodeSetReader& skipNodeMap(std::string name,
+NodeSetReader& skipNodeMap(std::string label,
-			   const Reader& reader = Reader()) {
+const ItemReader& ir = ItemReader()) {
-if (readers.find(name) != readers.end()) {
+if (readers.find(label) != readers.end()) {
 	ErrorMessage msg;
-	msg << "Multiple read rule for node map: " << name;
+	msg << "Multiple read rule for node map: " << label;
 	throw IoParameterError(msg.message());
 }
-readers.insert(make_pair(name, new _reader_bits::
+readers.insert(make_pair(label, new _reader_bits::
-			       SkipReader<Node, Reader>(reader)));
+			       SkipReader<Node, ItemReader>(ir)));
 return *this;
 }
 protected:
 /// It reads the content of the section.
 virtual void read(std::istream& is) {
 std::vector<_reader_bits::MapReaderBase<Node>* > index;
 std::string line;
-getline(is, line);
+{
-std::istringstream ls(line);
+getline(is, line);
-std::string id;
+std::istringstream ls(line);
-while (ls >> id) {
+std::string id;
-	typename MapReaders::iterator it = readers.find(id);
+while (ls >> id) {
-	if (it != readers.end()) {
+typename MapReaders::iterator it = readers.find(id);
-	  it->second->touch();
+if (it != readers.end()) {
-	  index.push_back(it->second);
+it->second->touch();
-	} else {
+index.push_back(it->second);
-	  index.push_back(&skipper);
+} else {
-	}
+index.push_back(&skipper);
-	if (id == "label") {
+}
-	  inverter.reset(index.back()->getInverter());
+if (id == "label") {
-	  index.back() = inverter.get();
+inverter.reset(index.back()->getInverter());
-	}
+index.back() = inverter.get();
+}
+}
 }
 for (typename MapReaders::iterator it = readers.begin();
 	   it != readers.end(); ++it) {
 	if (!it->second->touched()) {
 	  ErrorMessage msg;
 	}
 }
 while (getline(is, line)) {
 	Node node = graph.addNode();
 	std::istringstream ls(line);
-	for (int i = 0; i < (int)index.size(); ++i) {
+	for (int i = 0; i < int(index.size()); ++i) {
 	  index[i]->read(ls, node);
 	}
 }
 }
 /// \brief Add a new edge map reader command for the reader.
 ///
 /// Add a new edge map reader command for the reader.
 template <typename Map>
-EdgeSetReader& readEdgeMap(std::string name, Map& map) {
+EdgeSetReader& readEdgeMap(std::string label, Map& map) {
 return _readMap<
 	typename Traits::template Reader<typename Map::Value>, Map,
-	typename _reader_bits::Arg<Map>::Type>(name, map);
+	typename _reader_bits::Arg<Map>::Type>(label, map);
 }
 template <typename Map>
-EdgeSetReader& readEdgeMap(std::string name, const Map& map) {
+EdgeSetReader& readEdgeMap(std::string label, const Map& map) {
 return _readMap<
 	typename Traits::template Reader<typename Map::Value>, Map,
-	typename _reader_bits::Arg<Map>::Type>(name, map);
+	typename _reader_bits::Arg<Map>::Type>(label, map);
 }
 /// \brief Add a new edge map reader command for the reader.
 ///
 /// Add a new edge map reader command for the reader.
-template <typename Reader, typename Map>
+template <typename ItemReader, typename Map>
-EdgeSetReader& readEdgeMap(std::string name, Map& map,
+EdgeSetReader& readEdgeMap(std::string label, Map& map,
-			   const Reader& reader = Reader()) {
+const ItemReader& ir = ItemReader()) {
-return _readMap<Reader, Map,
+return _readMap<ItemReader, Map,
-	typename _reader_bits::Arg<Map>::Type>(name, map, reader);
+	typename _reader_bits::Arg<Map>::Type>(label, map, ir);
 }
-template <typename Reader, typename Map>
+template <typename ItemReader, typename Map>
-EdgeSetReader& readEdgeMap(std::string name, const Map& map,
+EdgeSetReader& readEdgeMap(std::string label, const Map& map,
-			       const Reader& reader = Reader()) {
+			       const ItemReader& ir = ItemReader()) {
-return _readMap<Reader, Map,
+return _readMap<ItemReader, Map,
-	typename _reader_bits::Arg<Map>::Type>(name, map, reader);
+	typename _reader_bits::Arg<Map>::Type>(label, map, ir);
 }
 private:
-template <typename Reader, typename Map, typename MapParameter>
+template <typename ItemReader, typename Map, typename MapParameter>
-EdgeSetReader& _readMap(std::string name, MapParameter map,
+EdgeSetReader& _readMap(std::string label, MapParameter map,
-			    const Reader& reader = Reader()) {
+			    const ItemReader& ir = ItemReader()) {
 checkConcept<concepts::WriteMap<Edge, typename Map::Value>, Map>();
-checkConcept<_reader_bits::ItemReader<typename Map::Value>, Reader>();
+checkConcept<_reader_bits::ItemReader<typename Map::Value>, ItemReader>();
-if (readers.find(name) != readers.end()) {
+if (readers.find(label) != readers.end()) {
 	ErrorMessage msg;
-	msg << "Multiple read rule for edge map: " << name;
+	msg << "Multiple read rule for edge map: " << label;
 	throw IoParameterError(msg.message());
 }
 readers.insert(
-	make_pair(name, new _reader_bits::
+	make_pair(label, new _reader_bits::
-		  MapReader<Edge, Map, Reader>(map, reader)));
+		  MapReader<Edge, Map, ItemReader>(map, ir)));
 return *this;
 }
 public:
 /// \brief Add a new edge map skipper command for the reader.
 ///
 /// Add a new edge map skipper command for the reader.
-template <typename Reader>
+template <typename ItemReader>
-EdgeSetReader& skipEdgeMap(std::string name,
+EdgeSetReader& skipEdgeMap(std::string label,
-			       const Reader& reader = Reader()) {
+			       const ItemReader& ir = ItemReader()) {
-if (readers.find(name) != readers.end()) {
+if (readers.find(label) != readers.end()) {
 	ErrorMessage msg;
-	msg << "Multiple read rule for edge map: " << name;
+	msg << "Multiple read rule for edge map: " << label;
 	throw IoParameterError(msg.message());
 }
-readers.insert(make_pair(name, new _reader_bits::
+readers.insert(make_pair(label, new _reader_bits::
-			       SkipReader<Edge, Reader>(reader)));
+			       SkipReader<Edge, ItemReader>(ir)));
 return *this;
 }
 protected:
 	throw DataFormatError("Cannot find nodeset or label map");
 }
 std::vector<_reader_bits::MapReaderBase<Edge>* > index;
 std::string line;
-getline(is, line);
+{
-std::istringstream ls(line);
+getline(is, line);
-std::string id;
+std::istringstream ls(line);
-while (ls >> id) {
+std::string id;
-	typename MapReaders::iterator it = readers.find(id);
+while (ls >> id) {
-	if (it != readers.end()) {
+typename MapReaders::iterator it = readers.find(id);
-	  index.push_back(it->second);
+if (it != readers.end()) {
-	  it->second->touch();
+index.push_back(it->second);
-	} else {
+it->second->touch();
-	  index.push_back(&skipper);
+} else {
-	}
+index.push_back(&skipper);
-	if (id == "label") {
+}
-	  inverter.reset(index.back()->getInverter());
+if (id == "label") {
-	  index.back() = inverter.get();
+inverter.reset(index.back()->getInverter());
-	}
+index.back() = inverter.get();
+}
+}
 }
 for (typename MapReaders::iterator it = readers.begin();
 	   it != readers.end(); ++it) {
 	if (!it->second->touched()) {
 	  ErrorMessage msg;
 while (getline(is, line)) {
 	std::istringstream ls(line);
 	Node from = nodeLabelReader->read(ls);
 	Node to = nodeLabelReader->read(ls);
 	Edge edge = graph.addEdge(from, to);
-	for (int i = 0; i < (int)index.size(); ++i) {
+	for (int i = 0; i < int(index.size()); ++i) {
 	  index[i]->read(ls, edge);
 	}
 }
 }
 /// \brief Add a new undirected edge map reader command for the reader.
 ///
 /// Add a new edge undirected map reader command for the reader.
 template <typename Map>
-UEdgeSetReader& readUEdgeMap(std::string name, Map& map) {
+UEdgeSetReader& readUEdgeMap(std::string label, Map& map) {
 return _readMap<
 	typename Traits::template Reader<typename Map::Value>, Map,
-	typename _reader_bits::Arg<Map>::Type>(name, map);
+	typename _reader_bits::Arg<Map>::Type>(label, map);
 }
 template <typename Map>
-UEdgeSetReader& readUEdgeMap(std::string name, const Map& map) {
+UEdgeSetReader& readUEdgeMap(std::string label, const Map& map) {
 return _readMap<
 	typename Traits::template Reader<typename Map::Value>, Map,
-	typename _reader_bits::Arg<Map>::Type>(name, map);
+	typename _reader_bits::Arg<Map>::Type>(label, map);
 }
 /// \brief Add a new undirected edge map reader command for the reader.
 ///
 /// Add a new edge undirected map reader command for the reader.
-template <typename Reader, typename Map>
+template <typename ItemReader, typename Map>
-UEdgeSetReader& readUEdgeMap(std::string name, Map& map,
+UEdgeSetReader& readUEdgeMap(std::string label, Map& map,
-					 const Reader& reader = Reader()) {
+const ItemReader& ir = ItemReader()) {
-return _readMap<Reader, Map, typename _reader_bits::Arg<Map>::Type>
+return _readMap<ItemReader, Map, typename _reader_bits::Arg<Map>::Type>
-	(name, map, reader);
+	(label, map, ir);
 }
-template <typename Reader, typename Map>
+template <typename ItemReader, typename Map>
-UEdgeSetReader& readUEdgeMap(std::string name, const Map& map,
+UEdgeSetReader& readUEdgeMap(std::string label, const Map& map,
-					 const Reader& reader = Reader()) {
+const ItemReader& ir = ItemReader()) {
-return _readMap<Reader, Map, typename _reader_bits::Arg<Map>::Type >
+return _readMap<ItemReader, Map, typename _reader_bits::Arg<Map>::Type >
-	(name, map, reader);
+	(label, map, ir);
 }
 private:
-template <typename Reader, typename Map, typename MapParameter>
+template <typename ItemReader, typename Map, typename MapParameter>
-UEdgeSetReader& _readMap(std::string name, MapParameter map,
+UEdgeSetReader& _readMap(std::string label, MapParameter map,
-				 const Reader& reader = Reader()) {
+const ItemReader& ir = ItemReader()) {
 checkConcept<concepts::WriteMap<UEdge, typename Map::Value>, Map>();
-checkConcept<_reader_bits::ItemReader<typename Map::Value>, Reader>();
+checkConcept<_reader_bits::ItemReader<typename Map::Value>, ItemReader>();
-if (readers.find(name) != readers.end()) {
+if (readers.find(label) != readers.end()) {
 	ErrorMessage msg;
-	msg << "Multiple read rule for edge map: " << name;
+	msg << "Multiple read rule for edge map: " << label;
 	throw IoParameterError(msg.message());
 }
 readers.insert(
-	make_pair(name, new _reader_bits::
+	make_pair(label, new _reader_bits::
-		  MapReader<UEdge, Map, Reader>(map, reader)));
+		  MapReader<UEdge, Map, ItemReader>(map, ir)));
 return *this;
 }
 public:
 /// \brief Add a new undirected edge map skipper command for the reader.
 ///
 /// Add a new undirected edge map skipper command for the reader.
-template <typename Reader>
+template <typename ItemReader>
-UEdgeSetReader& skipUEdgeMap(std::string name,
+UEdgeSetReader& skipUEdgeMap(std::string label,
-					 const Reader& reader = Reader()) {
+const ItemReader& ir = ItemReader()) {
-if (readers.find(name) != readers.end()) {
+if (readers.find(label) != readers.end()) {
 	ErrorMessage msg;
-	msg << "Multiple read rule for node map: " << name;
+	msg << "Multiple read rule for node map: " << label;
 	throw IoParameterError(msg.message());
 }
-readers.insert(make_pair(name, new _reader_bits::
+readers.insert(make_pair(label, new _reader_bits::
-			       SkipReader<UEdge, Reader>(reader)));
+			       SkipReader<UEdge, ItemReader>(ir)));
 return *this;
 }
 /// \brief Add a new directed edge map reader command for the reader.
 ///
 /// Add a new directed edge map reader command for the reader.
 template <typename Map>
-UEdgeSetReader& readEdgeMap(std::string name, Map& map) {
+UEdgeSetReader& readEdgeMap(std::string label, Map& map) {
 return _readDirMap<
 	typename Traits::template Reader<typename Map::Value>, Map,
-	typename _reader_bits::Arg<Map>::Type>(name, map);
+	typename _reader_bits::Arg<Map>::Type>(label, map);
 }
 template <typename Map>
-UEdgeSetReader& readEdgeMap(std::string name, const Map& map) {
+UEdgeSetReader& readEdgeMap(std::string label, const Map& map) {
 return _readDirMap<
 	typename Traits::template Reader<typename Map::Value>, Map,
-	typename _reader_bits::Arg<Map>::Type>(name, map);
+	typename _reader_bits::Arg<Map>::Type>(label, map);
 }
 /// \brief Add a new directed edge map reader command for the reader.
 ///
 /// Add a new directed edge map reader command for the reader.
-template <typename Reader, typename Map>
+template <typename ItemReader, typename Map>
-UEdgeSetReader& readEdgeMap(std::string name, Map& map,
+UEdgeSetReader& readEdgeMap(std::string label, Map& map,
-				    const Reader& reader = Reader()) {
+				    const ItemReader& ir = ItemReader()) {
-return _readDirMap<Reader, Map, typename _reader_bits::Arg<Map>::Type>
+return _readDirMap<ItemReader, Map,
-	(name, map, reader);
+typename _reader_bits::Arg<Map>::Type>(label, map, ir);
 }
-template <typename Reader, typename Map>
+template <typename ItemReader, typename Map>
-UEdgeSetReader& readEdgeMap(std::string name, const Map& map,
+UEdgeSetReader& readEdgeMap(std::string label, const Map& map,
-				    const Reader& reader = Reader()) {
+				    const ItemReader& ir = ItemReader()) {
-return _readDirMap<Reader, Map, typename _reader_bits::Arg<Map>::Type>
+return _readDirMap<ItemReader, Map,
-	(name, map, reader);
+typename _reader_bits::Arg<Map>::Type>(label, map, ir);
 }
 private:
-template <typename Reader, typename Map, typename MapParameter>
+template <typename ItemReader, typename Map, typename MapParameter>
-UEdgeSetReader& _readDirMap(std::string name, MapParameter map,
+UEdgeSetReader& _readDirMap(std::string label, MapParameter map,
-				    const Reader& reader = Reader()) {
+				    const ItemReader& ir = ItemReader()) {
-checkConcept<_reader_bits::ItemReader<typename Map::Value>, Reader>();
+checkConcept<_reader_bits::ItemReader<typename Map::Value>, ItemReader>();
 checkConcept<concepts::WriteMap<Edge, typename Map::Value>, Map>();
-readUEdgeMap("+" + name,
+readUEdgeMap("+" + label,
-_reader_bits::forwardComposeMap(graph, map), reader);
+_reader_bits::forwardComposeMap(graph, map), ir);
-readUEdgeMap("-" + name,
+readUEdgeMap("-" + label,
-_reader_bits::backwardComposeMap(graph, map), reader);
+_reader_bits::backwardComposeMap(graph, map), ir);
 return *this;
 }
 public:
 /// \brief Add a new directed edge map skipper command for the reader.
 ///
 /// Add a new directed edge map skipper command for the reader.
-template <typename Reader>
+template <typename ItemReader>
-UEdgeSetReader& skipEdgeMap(std::string name,
+UEdgeSetReader& skipEdgeMap(std::string label,
-const Reader& reader = Reader()) {
+const ItemReader& ir = ItemReader()) {
-skipUEdgeMap("+" + name, reader);
+skipUEdgeMap("+" + label, ir);
-skipUEdgeMap("-" + name, reader);
+skipUEdgeMap("-" + label, ir);
 return *this;
 }
 protected:
 	throw DataFormatError("Cannot find nodeset or label map");
 }
 std::vector<_reader_bits::MapReaderBase<UEdge>* > index;
 std::string line;
-getline(is, line);
+{
-std::istringstream ls(line);
+getline(is, line);
-std::string id;
+std::istringstream ls(line);
-while (ls >> id) {
+std::string id;
-	typename MapReaders::iterator it = readers.find(id);
+while (ls >> id) {
-	if (it != readers.end()) {
+typename MapReaders::iterator it = readers.find(id);
-	  index.push_back(it->second);
+if (it != readers.end()) {
-	  it->second->touch();
+index.push_back(it->second);
-	} else {
+it->second->touch();
-	  index.push_back(&skipper);
+} else {
-	}
+index.push_back(&skipper);
-	if (id == "label") {
+}
-	  inverter.reset(index.back()->getInverter());
+if (id == "label") {
-	  index.back() = inverter.get();
+inverter.reset(index.back()->getInverter());
-	}
+index.back() = inverter.get();
 }
-for (typename MapReaders::iterator it = readers.begin();
+}
-	   it != readers.end(); ++it) {
+for (typename MapReaders::iterator it = readers.begin();
-	if (!it->second->touched()) {
+it != readers.end(); ++it) {
-	  ErrorMessage msg;
+if (!it->second->touched()) {
-	  msg << "Map not found in file: " << it->first;
+ErrorMessage msg;
-	  throw IoParameterError(msg.message());
+msg << "Map not found in file: " << it->first;
-	}
+throw IoParameterError(msg.message());
+}
+}
 }
 while (getline(is, line)) {
 	std::istringstream ls(line);
 	Node from = nodeLabelReader->read(ls);
 	Node to = nodeLabelReader->read(ls);
 	UEdge edge = graph.addEdge(from, to);
-	for (int i = 0; i < (int)index.size(); ++i) {
+	for (int i = 0; i < int(index.size()); ++i) {
 	  index[i]->read(ls, edge);
 	}
 }
 }
 public:
 /// \brief Add a node reader command for the NodeReader.
 ///
 /// Add a node reader command for the NodeReader.
-void readNode(const std::string& name, Node& item) {
+void readNode(std::string label, Node& item) {
-if (readers.find(name) != readers.end()) {
+if (readers.find(label) != readers.end()) {
 	ErrorMessage msg;
-	msg << "Multiple read rule for node: " << name;
+	msg << "Multiple read rule for node: " << label;
 	throw IoParameterError(msg.message());
 }
-readers.insert(make_pair(name, _reader_bits::ItemStore<Node>(item)));
+readers.insert(make_pair(label, _reader_bits::ItemStore<Node>(item)));
 }
 protected:
 /// \brief Gives back true when the SectionReader can process
 public:
 /// \brief Add an edge reader command for the EdgeReader.
 ///
 /// Add an edge reader command for the EdgeReader.
-void readEdge(const std::string& name, Edge& item) {
+void readEdge(std::string label, Edge& item) {
-if (readers.find(name) != readers.end()) {
+if (readers.find(label) != readers.end()) {
 	ErrorMessage msg;
-	msg << "Multiple read rule for edge: " << name;
+	msg << "Multiple read rule for edge: " << label;
 	throw IoParameterError(msg.message());
 }
-readers.insert(make_pair(name, _reader_bits::ItemStore<Edge>(item)));
+readers.insert(make_pair(label, _reader_bits::ItemStore<Edge>(item)));
 }
 protected:
 /// \brief Gives back true when the SectionReader can process
 public:
 /// \brief Add an undirected edge reader command for the UEdgeReader.
 ///
 /// Add an undirected edge reader command for the UEdgeReader.
-void readUEdge(const std::string& name, UEdge& item) {
+void readUEdge(std::string label, UEdge& item) {
-if (uEdgeReaders.find(name) != uEdgeReaders.end()) {
+if (uEdgeReaders.find(label) != uEdgeReaders.end()) {
 	ErrorMessage msg;
-	msg << "Multiple read rule for undirected edge: " << name;
+	msg << "Multiple read rule for undirected edge: " << label;
 	throw IoParameterError(msg.message());
 }
-uEdgeReaders.insert(make_pair(name, _reader_bits::
+uEdgeReaders.insert(make_pair(label, _reader_bits::
 					ItemStore<UEdge>(item)));
 }
 /// \brief Add an edge reader command for the UEdgeReader.
 ///
 /// Add an edge reader command for the UEdgeReader.
-void readEdge(const std::string& name, Edge& item) {
+void readEdge(std::string label, Edge& item) {
-if (edgeReaders.find(name) != edgeReaders.end()) {
+if (edgeReaders.find(label) != edgeReaders.end()) {
 	ErrorMessage msg;
-	msg << "Multiple read rule for edge: " << name;
+	msg << "Multiple read rule for edge: " << label;
 	throw IoParameterError(msg.message());
 }
-edgeReaders.insert(make_pair(name, _reader_bits::ItemStore<Edge>(item)));
+edgeReaders.insert(make_pair(label, _reader_bits::ItemStore<Edge>(item)));
 }
 protected:
 /// \brief Gives back true when the SectionReader can process
 }
 /// \brief Add an attribute reader command for the reader.
 ///
 /// Add an attribute reader command for the reader.
-template <typename Reader, typename Value>
+template <typename ItemReader, typename Value>
-AttributeReader& readAttribute(const std::string& name, Value& value,
+AttributeReader& readAttribute(std::string label, Value& value,
-				   const Reader& reader = Reader()) {
+				   const ItemReader& ir = ItemReader()) {
-checkConcept<_reader_bits::ItemReader<Value>, Reader>();
+checkConcept<_reader_bits::ItemReader<Value>, ItemReader>();
-if (readers.find(name) != readers.end()) {
+if (readers.find(label) != readers.end()) {
 	ErrorMessage msg;
-	msg << "Multiple read rule for attribute: " << name;
+	msg << "Multiple read rule for attribute: " << label;
 	throw IoParameterError(msg.message());
 }
-readers.insert(make_pair(name, new _reader_bits::
+readers.insert(make_pair(label, new _reader_bits::
-			       ValueReader<Value, Reader>(value, reader)));
+			       ValueReader<Value, ItemReader>(value, ir)));
 return *this;
 }
 protected:

changeset 2386	81b47fc5c444
parent 2368	6b2e8b734ae7
child 2391	14a343be7a5a