[Lemon-commits] [lemon_svn] alpar: r2867 - hugo/trunk/lemon
Lemon SVN
svn at lemon.cs.elte.hu
Mon Nov 6 21:50:54 CET 2006
Author: alpar
Date: Tue Jul 18 17:57:55 2006
New Revision: 2867
Modified:
hugo/trunk/lemon/error.h
hugo/trunk/lemon/lemon_reader.h
Log:
Better 'Naming Convention' conformance.
Modified: hugo/trunk/lemon/error.h
==============================================================================
--- hugo/trunk/lemon/error.h (original)
+++ hugo/trunk/lemon/error.h Tue Jul 18 17:57:55 2006
@@ -235,15 +235,15 @@
};
///\e
- class IOError : public RuntimeError {
+ class IoError : public RuntimeError {
public:
virtual const char* what() const throw() {
- return "lemon::IOError";
+ return "lemon::IoError";
}
};
///\e
- class DataFormatError : public IOError {
+ class DataFormatError : public IoError {
protected:
ExceptionMember<std::string> _message;
ExceptionMember<std::string> _file;
@@ -253,7 +253,7 @@
public:
DataFormatError(const DataFormatError &dfe) :
- IOError(dfe), _message(dfe._message), _file(dfe._file),
+ IoError(dfe), _message(dfe._message), _file(dfe._file),
_line(dfe._line) {}
///\e
@@ -318,7 +318,7 @@
};
///\e
- class FileOpenError : public IOError {
+ class FileOpenError : public IoError {
protected:
ExceptionMember<std::string> _file;
@@ -326,7 +326,7 @@
public:
FileOpenError(const FileOpenError &foe) :
- IOError(foe), _file(foe._file) {}
+ IoError(foe), _file(foe._file) {}
///\e
explicit FileOpenError(const std::string& file)
@@ -362,7 +362,7 @@
virtual ~FileOpenError() throw() {}
};
- class IOParameterError : public IOError {
+ class IoParameterError : public IoError {
protected:
ExceptionMember<std::string> _message;
ExceptionMember<std::string> _file;
@@ -370,15 +370,15 @@
mutable ExceptionMember<std::string> _message_holder;
public:
- IOParameterError(const IOParameterError &ile) :
- IOError(ile), _message(ile._message), _file(ile._file) {}
+ IoParameterError(const IoParameterError &ile) :
+ IoError(ile), _message(ile._message), _file(ile._file) {}
///\e
- explicit IOParameterError(const char *the_message)
+ explicit IoParameterError(const char *the_message)
: _message(the_message) {}
///\e
- IOParameterError(const char *file_name, const char *the_message)
+ IoParameterError(const char *file_name, const char *the_message)
: _message(the_message), _file(file_name) {}
///\e
@@ -416,9 +416,9 @@
}
catch (...) {}
if( _message_holder.valid() ) return _message_holder.get().c_str();
- return "lemon:IOParameterError";
+ return "lemon:IoParameterError";
}
- virtual ~IOParameterError() throw() {}
+ virtual ~IoParameterError() throw() {}
};
Modified: hugo/trunk/lemon/lemon_reader.h
==============================================================================
--- hugo/trunk/lemon/lemon_reader.h (original)
+++ hugo/trunk/lemon/lemon_reader.h Tue Jul 18 17:57:55 2006
@@ -836,7 +836,7 @@
if (readers.find(name) != readers.end()) {
ErrorMessage msg;
msg << "Multiple read rule for node map: " << name;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
readers.insert(
make_pair(name, new _reader_bits::
@@ -855,7 +855,7 @@
if (readers.find(name) != readers.end()) {
ErrorMessage msg;
msg << "Multiple read rule for node map: " << name;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
readers.insert(make_pair(name, new _reader_bits::
SkipReader<Node, Reader>(reader)));
@@ -905,7 +905,7 @@
if (!it->second->touched()) {
ErrorMessage msg;
msg << "Map not found in file: " << it->first;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
}
while (getline(is, line)) {
@@ -921,7 +921,7 @@
if (readers.empty()) return;
ErrorMessage msg;
msg << "NodeSet section not found in file: @nodeset " << name;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
public:
@@ -1066,7 +1066,7 @@
if (readers.find(name) != readers.end()) {
ErrorMessage msg;
msg << "Multiple read rule for edge map: " << name;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
readers.insert(
make_pair(name, new _reader_bits::
@@ -1085,7 +1085,7 @@
if (readers.find(name) != readers.end()) {
ErrorMessage msg;
msg << "Multiple read rule for edge map: " << name;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
readers.insert(make_pair(name, new _reader_bits::
SkipReader<Edge, Reader>(reader)));
@@ -1138,7 +1138,7 @@
if (!it->second->touched()) {
ErrorMessage msg;
msg << "Map not found in file: " << it->first;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
}
while (getline(is, line)) {
@@ -1156,7 +1156,7 @@
if (readers.empty()) return;
ErrorMessage msg;
msg << "EdgeSet section not found in file: @edgeset " << name;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
public:
@@ -1310,7 +1310,7 @@
if (readers.find(name) != readers.end()) {
ErrorMessage msg;
msg << "Multiple read rule for edge map: " << name;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
readers.insert(
make_pair(name, new _reader_bits::
@@ -1329,7 +1329,7 @@
if (readers.find(name) != readers.end()) {
ErrorMessage msg;
msg << "Multiple read rule for node map: " << name;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
readers.insert(make_pair(name, new _reader_bits::
SkipReader<UEdge, Reader>(reader)));
@@ -1443,7 +1443,7 @@
if (!it->second->touched()) {
ErrorMessage msg;
msg << "Map not found in file: " << it->first;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
}
while (getline(is, line)) {
@@ -1461,7 +1461,7 @@
if (readers.empty()) return;
ErrorMessage msg;
msg << "UEdgeSet section not found in file: @uedgeset " << name;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
public:
@@ -1566,7 +1566,7 @@
if (readers.find(name) != readers.end()) {
ErrorMessage msg;
msg << "Multiple read rule for node: " << name;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
readers.insert(make_pair(name, _reader_bits::ItemStore<Node>(item)));
}
@@ -1609,7 +1609,7 @@
if (!it->second.touched()) {
ErrorMessage msg;
msg << "Node not found in file: " << it->first;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
}
}
@@ -1618,7 +1618,7 @@
if (readers.empty()) return;
ErrorMessage msg;
msg << "Nodes section not found in file: @nodes " << name;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
private:
@@ -1679,7 +1679,7 @@
if (readers.find(name) != readers.end()) {
ErrorMessage msg;
msg << "Multiple read rule for edge: " << name;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
readers.insert(make_pair(name, _reader_bits::ItemStore<Edge>(item)));
}
@@ -1722,7 +1722,7 @@
if (!it->second.touched()) {
ErrorMessage msg;
msg << "Edge not found in file: " << it->first;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
}
}
@@ -1731,7 +1731,7 @@
if (readers.empty()) return;
ErrorMessage msg;
msg << "Edges section not found in file: @edges " << name;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
private:
@@ -1797,7 +1797,7 @@
if (uEdgeReaders.find(name) != uEdgeReaders.end()) {
ErrorMessage msg;
msg << "Multiple read rule for undirected edge: " << name;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
uEdgeReaders.insert(make_pair(name, _reader_bits::
ItemStore<UEdge>(item)));
@@ -1810,7 +1810,7 @@
if (edgeReaders.find(name) != edgeReaders.end()) {
ErrorMessage msg;
msg << "Multiple read rule for edge: " << name;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
edgeReaders.insert(make_pair(name, _reader_bits::ItemStore<Edge>(item)));
}
@@ -1866,7 +1866,7 @@
if (!it->second.touched()) {
ErrorMessage msg;
msg << "Edge not found in file: " << it->first;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
}
for (typename UEdgeReaders::iterator it = uEdgeReaders.begin();
@@ -1874,7 +1874,7 @@
if (!it->second.touched()) {
ErrorMessage msg;
msg << "UEdge not found in file: " << it->first;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
}
}
@@ -1883,7 +1883,7 @@
if (edgeReaders.empty() && uEdgeReaders.empty()) return;
ErrorMessage msg;
msg << "UEdges section not found in file: @uedges " << name;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
private:
@@ -1959,7 +1959,7 @@
if (readers.find(name) != readers.end()) {
ErrorMessage msg;
msg << "Multiple read rule for attribute: " << name;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
readers.insert(make_pair(name, new _reader_bits::
ValueReader<Value, Reader>(value, reader)));
@@ -2001,7 +2001,7 @@
if (!it->second->touched()) {
ErrorMessage msg;
msg << "Attribute not found in file: " << it->first;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
}
}
@@ -2010,7 +2010,7 @@
if (readers.empty()) return;
ErrorMessage msg;
msg << "Attribute section not found in file: @attributes " << name;
- throw IOParameterError(msg.message());
+ throw IoParameterError(msg.message());
}
private:
More information about the Lemon-commits
mailing list