lemon-1.1: comparison lemon/lgf

equal deleted inserted replaced

-:d5b4b3f0353d
+:3194d204de78
 template <typename Value>
 struct DefaultConverter {
 Value operator()(const std::string& str) {
 std::istringstream is(str);
 Value value;
-is >> value;
+if (!(is >> value)) {
+throw FormatError("Cannot read token");
+}
 char c;
 if (is >> std::ws >> c) {
-throw DataFormatError("Remaining characters in token");
+throw FormatError("Remaining characters in token");
 }
 return value;
 }
 };
 typename std::map<std::string, Value>::const_iterator it =
 _map.find(str);
 if (it == _map.end()) {
 std::ostringstream msg;
 msg << "Item not found: " << str;
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 return it->second;
 }
 };
 typename Graph::Edge>& map)
 : _graph(graph), _map(map) {}
 typename Graph::Arc operator()(const std::string& str) {
 if (str.empty() || (str[0] != '+' && str[0] != '-')) {
-throw DataFormatError("Item must start with '+' or '-'");
+throw FormatError("Item must start with '+' or '-'");
 }
 typename std::map<std::string, typename Graph::Edge>
 ::const_iterator it = _map.find(str.substr(1));
 if (it == _map.end()) {
-throw DataFormatError("Item not found");
+throw FormatError("Item not found");
 }
 return _graph.direct(it->second, str[0] == '+');
 }
 };
 }
 inline char readEscape(std::istream& is) {
 char c;
 if (!is.get(c))
-throw DataFormatError("Escape format error");
+throw FormatError("Escape format error");
 switch (c) {
 case '\\':
 return '\\';
 case '\"':
 return '\v';
 case 'x':
 {
 int code;
 if (!is.get(c) || !isHex(c))
-throw DataFormatError("Escape format error");
+throw FormatError("Escape format error");
 else if (code = valueHex(c), !is.get(c) || !isHex(c)) is.putback(c);
 else code = code * 16 + valueHex(c);
 return code;
 }
 default:
 {
 int code;
 if (!isOct(c))
-throw DataFormatError("Escape format error");
+throw FormatError("Escape format error");
 else if (code = valueOct(c), !is.get(c) || !isOct(c))
 is.putback(c);
 else if (code = code * 8 + valueOct(c), !is.get(c) || !isOct(c))
 is.putback(c);
 else code = code * 8 + valueOct(c);
 if (c == '\\')
 c = readEscape(is);
 os << c;
 }
 if (!is)
-throw DataFormatError("Quoted format error");
+throw FormatError("Quoted format error");
 } else {
 is.putback(c);
 while (is.get(c) && !isWhiteSpace(c)) {
 if (c == '\\')
 c = readEscape(is);
 private:
 std::istream* _is;
 bool local_is;
+std::string _filename;
 Digraph& _digraph;
 std::string _nodes_caption;
 std::string _arcs_caption;
 /// \brief Constructor
 ///
 /// Construct a directed graph reader, which reads from the given
 /// file.
 DigraphReader(Digraph& digraph, const std::string& fn)
-: _is(new std::ifstream(fn.c_str())), local_is(true), _digraph(digraph),
+: _is(new std::ifstream(fn.c_str())), local_is(true),
+_filename(fn), _digraph(digraph),
 _use_nodes(false), _use_arcs(false),
-_skip_nodes(false), _skip_arcs(false) {}
+_skip_nodes(false), _skip_arcs(false) {
+if (!(*_is)) throw IoError("Cannot open file", fn);
+}
 /// \brief Constructor
 ///
 /// Construct a directed graph reader, which reads from the given
 /// file.
 DigraphReader(Digraph& digraph, const char* fn)
-: _is(new std::ifstream(fn)), local_is(true), _digraph(digraph),
+: _is(new std::ifstream(fn)), local_is(true),
+_filename(fn), _digraph(digraph),
 _use_nodes(false), _use_arcs(false),
-_skip_nodes(false), _skip_arcs(false) {}
+_skip_nodes(false), _skip_arcs(false) {
+if (!(*_is)) throw IoError("Cannot open file", fn);
+}
 /// \brief Destructor
 ~DigraphReader() {
 for (typename NodeMaps::iterator it = _node_maps.begin();
 it != _node_maps.end(); ++it) {
 char c;
 if (!readLine() || !(line >> c) || c == '@') {
 if (readSuccess() && line) line.putback(c);
 if (!_node_maps.empty())
-throw DataFormatError("Cannot find map names");
+throw FormatError("Cannot find map names");
 return;
 }
 line.putback(c);
 {
 int index = 0;
 while (_reader_bits::readToken(line, map)) {
 if (maps.find(map) != maps.end()) {
 std::ostringstream msg;
 msg << "Multiple occurence of node map: " << map;
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 maps.insert(std::make_pair(map, index));
 ++index;
 }
 for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
 std::map<std::string, int>::iterator jt =
 maps.find(_node_maps[i].first);
 if (jt == maps.end()) {
 std::ostringstream msg;
-msg << "Map not found in file: " << _node_maps[i].first;
+msg << "Map not found: " << _node_maps[i].first;
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 map_index[i] = jt->second;
 }
 {
 std::vector<std::string> tokens(map_num);
 for (int i = 0; i < map_num; ++i) {
 if (!_reader_bits::readToken(line, tokens[i])) {
 std::ostringstream msg;
 msg << "Column not found (" << i + 1 << ")";
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 }
 if (line >> std::ws >> c)
-throw DataFormatError("Extra character on the end of line");
+throw FormatError("Extra character at the end of line");
 Node n;
 if (!_use_nodes) {
 n = _digraph.addNode();
 if (label_index != -1)
 _node_index.insert(std::make_pair(tokens[label_index], n));
 } else {
 if (label_index == -1)
-throw DataFormatError("Label map not found in file");
+throw FormatError("Label map not found");
 typename std::map<std::string, Node>::iterator it =
 _node_index.find(tokens[label_index]);
 if (it == _node_index.end()) {
 std::ostringstream msg;
 msg << "Node with label not found: " << tokens[label_index];
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 n = it->second;
 }
 for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
 char c;
 if (!readLine() || !(line >> c) || c == '@') {
 if (readSuccess() && line) line.putback(c);
 if (!_arc_maps.empty())
-throw DataFormatError("Cannot find map names");
+throw FormatError("Cannot find map names");
 return;
 }
 line.putback(c);
 {
 int index = 0;
 while (_reader_bits::readToken(line, map)) {
 if (maps.find(map) != maps.end()) {
 std::ostringstream msg;
 msg << "Multiple occurence of arc map: " << map;
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 maps.insert(std::make_pair(map, index));
 ++index;
 }
 for (int i = 0; i < static_cast<int>(_arc_maps.size()); ++i) {
 std::map<std::string, int>::iterator jt =
 maps.find(_arc_maps[i].first);
 if (jt == maps.end()) {
 std::ostringstream msg;
-msg << "Map not found in file: " << _arc_maps[i].first;
+msg << "Map not found: " << _arc_maps[i].first;
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 map_index[i] = jt->second;
 }
 {
 std::string source_token;
 std::string target_token;
 if (!_reader_bits::readToken(line, source_token))
-throw DataFormatError("Source not found");
+throw FormatError("Source not found");
 if (!_reader_bits::readToken(line, target_token))
-throw DataFormatError("Target not found");
+throw FormatError("Target not found");
 std::vector<std::string> tokens(map_num);
 for (int i = 0; i < map_num; ++i) {
 if (!_reader_bits::readToken(line, tokens[i])) {
 std::ostringstream msg;
 msg << "Column not found (" << i + 1 << ")";
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 }
 if (line >> std::ws >> c)
-throw DataFormatError("Extra character on the end of line");
+throw FormatError("Extra character at the end of line");
 Arc a;
 if (!_use_arcs) {
 typename NodeIndex::iterator it;
 it = _node_index.find(source_token);
 if (it == _node_index.end()) {
 std::ostringstream msg;
 msg << "Item not found: " << source_token;
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 Node source = it->second;
 it = _node_index.find(target_token);
 if (it == _node_index.end()) {
 std::ostringstream msg;
 msg << "Item not found: " << target_token;
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 Node target = it->second;
 a = _digraph.addArc(source, target);
 if (label_index != -1)
 _arc_index.insert(std::make_pair(tokens[label_index], a));
 } else {
 if (label_index == -1)
-throw DataFormatError("Label map not found in file");
+throw FormatError("Label map not found");
 typename std::map<std::string, Arc>::iterator it =
 _arc_index.find(tokens[label_index]);
 if (it == _arc_index.end()) {
 std::ostringstream msg;
 msg << "Arc with label not found: " << tokens[label_index];
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 a = it->second;
 }
 for (int i = 0; i < static_cast<int>(_arc_maps.size()); ++i) {
 while (readLine() && line >> c && c != '@') {
 line.putback(c);
 std::string attr, token;
 if (!_reader_bits::readToken(line, attr))
-throw DataFormatError("Attribute name not found");
+throw FormatError("Attribute name not found");
 if (!_reader_bits::readToken(line, token))
-throw DataFormatError("Attribute value not found");
+throw FormatError("Attribute value not found");
 if (line >> c)
-throw DataFormatError("Extra character on the end of line");
+throw FormatError("Extra character at the end of line");
 {
 std::set<std::string>::iterator it = read_attr.find(attr);
 if (it != read_attr.end()) {
 std::ostringstream msg;
-msg << "Multiple occurence of attribute " << attr;
+msg << "Multiple occurence of attribute: " << attr;
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 read_attr.insert(attr);
 }
 {
 }
 for (typename Attributes::iterator it = _attributes.begin();
 it != _attributes.end(); ++it) {
 if (read_attr.find(it->first) == read_attr.end()) {
 std::ostringstream msg;
-msg << "Attribute not found in file: " << it->first;
+msg << "Attribute not found: " << it->first;
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 }
 }
 public:
 /// \brief Start the batch processing
 ///
 /// 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 = _skip_nodes;
 bool arcs_done = _skip_arcs;
 bool attributes_done = false;
 line >> c;
 _reader_bits::readToken(line, section);
 _reader_bits::readToken(line, caption);
 if (line >> c)
-throw DataFormatError("Extra character on the end of line");
+throw FormatError("Extra character at the end of line");
 if (section == "nodes" && !nodes_done) {
 if (_nodes_caption.empty() || _nodes_caption == caption) {
 readNodes();
 nodes_done = true;
 }
 } else {
 readLine();
 skipSection();
 }
-} catch (DataFormatError& error) {
+} catch (FormatError& error) {
 error.line(line_num);
+error.file(_filename);
 throw;
 }
 }
 if (!nodes_done) {
-throw DataFormatError("Section @nodes not found");
+throw FormatError("Section @nodes not found");
 }
 if (!arcs_done) {
-throw DataFormatError("Section @arcs not found");
+throw FormatError("Section @arcs not found");
 }
 if (!attributes_done && !_attributes.empty()) {
-throw DataFormatError("Section @attributes not found");
+throw FormatError("Section @attributes not found");
 }
 }
 /// @}
 private:
 std::istream* _is;
 bool local_is;
+std::string _filename;
 Graph& _graph;
 std::string _nodes_caption;
 std::string _edges_caption;
 /// \brief Constructor
 ///
 /// Construct an undirected graph reader, which reads from the given
 /// file.
 GraphReader(Graph& graph, const std::string& fn)
-: _is(new std::ifstream(fn.c_str())), local_is(true), _graph(graph),
+: _is(new std::ifstream(fn.c_str())), local_is(true),
+_filename(fn), _graph(graph),
 _use_nodes(false), _use_edges(false),
-_skip_nodes(false), _skip_edges(false) {}
+_skip_nodes(false), _skip_edges(false) {
+if (!(*_is)) throw IoError("Cannot open file", fn);
+}
 /// \brief Constructor
 ///
 /// Construct an undirected graph reader, which reads from the given
 /// file.
 GraphReader(Graph& graph, const char* fn)
-: _is(new std::ifstream(fn)), local_is(true), _graph(graph),
+: _is(new std::ifstream(fn)), local_is(true),
+_filename(fn), _graph(graph),
 _use_nodes(false), _use_edges(false),
-_skip_nodes(false), _skip_edges(false) {}
+_skip_nodes(false), _skip_edges(false) {
+if (!(*_is)) throw IoError("Cannot open file", fn);
+}
 /// \brief Destructor
 ~GraphReader() {
 for (typename NodeMaps::iterator it = _node_maps.begin();
 it != _node_maps.end(); ++it) {
 char c;
 if (!readLine() || !(line >> c) || c == '@') {
 if (readSuccess() && line) line.putback(c);
 if (!_node_maps.empty())
-throw DataFormatError("Cannot find map names");
+throw FormatError("Cannot find map names");
 return;
 }
 line.putback(c);
 {
 int index = 0;
 while (_reader_bits::readToken(line, map)) {
 if (maps.find(map) != maps.end()) {
 std::ostringstream msg;
 msg << "Multiple occurence of node map: " << map;
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 maps.insert(std::make_pair(map, index));
 ++index;
 }
 for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
 std::map<std::string, int>::iterator jt =
 maps.find(_node_maps[i].first);
 if (jt == maps.end()) {
 std::ostringstream msg;
-msg << "Map not found in file: " << _node_maps[i].first;
+msg << "Map not found: " << _node_maps[i].first;
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 map_index[i] = jt->second;
 }
 {
 std::vector<std::string> tokens(map_num);
 for (int i = 0; i < map_num; ++i) {
 if (!_reader_bits::readToken(line, tokens[i])) {
 std::ostringstream msg;
 msg << "Column not found (" << i + 1 << ")";
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 }
 if (line >> std::ws >> c)
-throw DataFormatError("Extra character on the end of line");
+throw FormatError("Extra character at the end of line");
 Node n;
 if (!_use_nodes) {
 n = _graph.addNode();
 if (label_index != -1)
 _node_index.insert(std::make_pair(tokens[label_index], n));
 } else {
 if (label_index == -1)
-throw DataFormatError("Label map not found in file");
+throw FormatError("Label map not found");
 typename std::map<std::string, Node>::iterator it =
 _node_index.find(tokens[label_index]);
 if (it == _node_index.end()) {
 std::ostringstream msg;
 msg << "Node with label not found: " << tokens[label_index];
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 n = it->second;
 }
 for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
 char c;
 if (!readLine() || !(line >> c) || c == '@') {
 if (readSuccess() && line) line.putback(c);
 if (!_edge_maps.empty())
-throw DataFormatError("Cannot find map names");
+throw FormatError("Cannot find map names");
 return;
 }
 line.putback(c);
 {
 int index = 0;
 while (_reader_bits::readToken(line, map)) {
 if (maps.find(map) != maps.end()) {
 std::ostringstream msg;
 msg << "Multiple occurence of edge map: " << map;
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 maps.insert(std::make_pair(map, index));
 ++index;
 }
 for (int i = 0; i < static_cast<int>(_edge_maps.size()); ++i) {
 std::map<std::string, int>::iterator jt =
 maps.find(_edge_maps[i].first);
 if (jt == maps.end()) {
 std::ostringstream msg;
-msg << "Map not found in file: " << _edge_maps[i].first;
+msg << "Map not found: " << _edge_maps[i].first;
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 map_index[i] = jt->second;
 }
 {
 std::string source_token;
 std::string target_token;
 if (!_reader_bits::readToken(line, source_token))
-throw DataFormatError("Node u not found");
+throw FormatError("Node u not found");
 if (!_reader_bits::readToken(line, target_token))
-throw DataFormatError("Node v not found");
+throw FormatError("Node v not found");
 std::vector<std::string> tokens(map_num);
 for (int i = 0; i < map_num; ++i) {
 if (!_reader_bits::readToken(line, tokens[i])) {
 std::ostringstream msg;
 msg << "Column not found (" << i + 1 << ")";
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 }
 if (line >> std::ws >> c)
-throw DataFormatError("Extra character on the end of line");
+throw FormatError("Extra character at the end of line");
 Edge e;
 if (!_use_edges) {
 typename NodeIndex::iterator it;
 it = _node_index.find(source_token);
 if (it == _node_index.end()) {
 std::ostringstream msg;
 msg << "Item not found: " << source_token;
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 Node source = it->second;
 it = _node_index.find(target_token);
 if (it == _node_index.end()) {
 std::ostringstream msg;
 msg << "Item not found: " << target_token;
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 Node target = it->second;
 e = _graph.addEdge(source, target);
 if (label_index != -1)
 _edge_index.insert(std::make_pair(tokens[label_index], e));
 } else {
 if (label_index == -1)
-throw DataFormatError("Label map not found in file");
+throw FormatError("Label map not found");
 typename std::map<std::string, Edge>::iterator it =
 _edge_index.find(tokens[label_index]);
 if (it == _edge_index.end()) {
 std::ostringstream msg;
 msg << "Edge with label not found: " << tokens[label_index];
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 e = it->second;
 }
 for (int i = 0; i < static_cast<int>(_edge_maps.size()); ++i) {
 while (readLine() && line >> c && c != '@') {
 line.putback(c);
 std::string attr, token;
 if (!_reader_bits::readToken(line, attr))
-throw DataFormatError("Attribute name not found");
+throw FormatError("Attribute name not found");
 if (!_reader_bits::readToken(line, token))
-throw DataFormatError("Attribute value not found");
+throw FormatError("Attribute value not found");
 if (line >> c)
-throw DataFormatError("Extra character on the end of line");
+throw FormatError("Extra character at the end of line");
 {
 std::set<std::string>::iterator it = read_attr.find(attr);
 if (it != read_attr.end()) {
 std::ostringstream msg;
-msg << "Multiple occurence of attribute " << attr;
+msg << "Multiple occurence of attribute: " << attr;
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 read_attr.insert(attr);
 }
 {
 }
 for (typename Attributes::iterator it = _attributes.begin();
 it != _attributes.end(); ++it) {
 if (read_attr.find(it->first) == read_attr.end()) {
 std::ostringstream msg;
-msg << "Attribute not found in file: " << it->first;
+msg << "Attribute not found: " << it->first;
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 }
 }
 public:
 line >> c;
 _reader_bits::readToken(line, section);
 _reader_bits::readToken(line, caption);
 if (line >> c)
-throw DataFormatError("Extra character on the end of line");
+throw FormatError("Extra character at the end of line");
 if (section == "nodes" && !nodes_done) {
 if (_nodes_caption.empty() || _nodes_caption == caption) {
 readNodes();
 nodes_done = true;
 }
 } else {
 readLine();
 skipSection();
 }
-} catch (DataFormatError& error) {
+} catch (FormatError& error) {
 error.line(line_num);
+error.file(_filename);
 throw;
 }
 }
 if (!nodes_done) {
-throw DataFormatError("Section @nodes not found");
+throw FormatError("Section @nodes not found");
 }
 if (!edges_done) {
-throw DataFormatError("Section @edges not found");
+throw FormatError("Section @edges not found");
 }
 if (!attributes_done && !_attributes.empty()) {
-throw DataFormatError("Section @attributes not found");
+throw FormatError("Section @attributes not found");
 }
 }
 /// @}
 class SectionReader {
 private:
 std::istream* _is;
 bool local_is;
+std::string _filename;
 typedef std::map<std::string, _reader_bits::Section*> Sections;
 Sections _sections;
 int line_num;
 /// \brief Constructor
 ///
 /// Construct a section reader, which reads from the given file.
 SectionReader(const std::string& fn)
-: _is(new std::ifstream(fn.c_str())), local_is(true) {}
+: _is(new std::ifstream(fn.c_str())), local_is(true),
+_filename(fn) {
+if (!(*_is)) throw IoError("Cannot open file", fn);
+}
 /// \brief Constructor
 ///
 /// Construct a section reader, which reads from the given file.
 SectionReader(const char* fn)
-: _is(new std::ifstream(fn)), local_is(true) {}
+: _is(new std::ifstream(fn)), local_is(true),
+_filename(fn) {
+if (!(*_is)) throw IoError("Cannot open file", fn);
+}
 /// \brief Destructor
 ~SectionReader() {
 for (Sections::iterator it = _sections.begin();
 it != _sections.end(); ++it) {
 line >> c;
 _reader_bits::readToken(line, section);
 _reader_bits::readToken(line, caption);
 if (line >> c)
-throw DataFormatError("Extra character on the end of line");
+throw FormatError("Extra character at the end of line");
 if (extra_sections.find(section) != extra_sections.end()) {
 std::ostringstream msg;
-msg << "Multiple occurence of section " << section;
+msg << "Multiple occurence of section: " << section;
-throw DataFormatError(msg.str().c_str());
+throw FormatError(msg.str());
 }
 Sections::iterator it = _sections.find(section);
 if (it != _sections.end()) {
 extra_sections.insert(section);
 it->second->process(*_is, line_num);
 }
 readLine();
 skipSection();
-} catch (DataFormatError& error) {
+} catch (FormatError& error) {
 error.line(line_num);
+error.file(_filename);
 throw;
 }
 }
 for (Sections::iterator it = _sections.begin();
 it != _sections.end(); ++it) {
 if (extra_sections.find(it->first) == extra_sections.end()) {
 std::ostringstream os;
 os << "Cannot find section: " << it->first;
-throw DataFormatError(os.str().c_str());
+throw FormatError(os.str());
 }
 }
 }
 /// @}
 /// \brief Constructor
 ///
 /// Construct an \e LGF contents reader, which reads from the given
 /// file.
 LgfContents(const std::string& fn)
-: _is(new std::ifstream(fn.c_str())), local_is(true) {}
+: _is(new std::ifstream(fn.c_str())), local_is(true) {
+if (!(*_is)) throw IoError("Cannot open file", fn);
+}
 /// \brief Constructor
 ///
 /// Construct an \e LGF contents reader, which reads from the given
 /// file.
 LgfContents(const char* fn)
-: _is(new std::ifstream(fn)), local_is(true) {}
+: _is(new std::ifstream(fn)), local_is(true) {
+if (!(*_is)) throw IoError("Cannot open file", fn);
+}
 /// \brief Destructor
 ~LgfContents() {
 if (local_is) delete _is;
 }

changeset 296	9768e60aa4e1
parent 293	47fbc814aa31
parent 291	d901321d6555
child 295	7c796c1cf1b0