0
4
0
| ... | ... |
@@ -41,11 +41,11 @@ |
| 41 | 41 |
/// |
| 42 | 42 |
class Exception : public std::exception {
|
| 43 | 43 |
public: |
| 44 |
///\e Constructor |
|
| 45 |
Exception() {}
|
|
| 46 |
/// |
|
| 44 |
///Constructor |
|
| 45 |
Exception() throw() {}
|
|
| 46 |
///Virtual destructor |
|
| 47 | 47 |
virtual ~Exception() throw() {}
|
| 48 |
/// |
|
| 48 |
///A short description of the exception |
|
| 49 | 49 |
virtual const char* what() const throw() {
|
| 50 | 50 |
return "lemon::Exception"; |
| 51 | 51 |
} |
| ... | ... |
@@ -64,29 +64,31 @@ |
| 64 | 64 |
public: |
| 65 | 65 |
|
| 66 | 66 |
/// Copy constructor |
| 67 |
IoError(const IoError &error) {
|
|
| 67 |
IoError(const IoError &error) throw() : Exception() {
|
|
| 68 | 68 |
message(error._message); |
| 69 | 69 |
file(error._file); |
| 70 | 70 |
} |
| 71 | 71 |
|
| 72 | 72 |
/// Constructor |
| 73 |
explicit IoError(const char *message) {
|
|
| 73 |
explicit IoError(const char *message) throw() {
|
|
| 74 | 74 |
IoError::message(message); |
| 75 | 75 |
} |
| 76 | 76 |
|
| 77 | 77 |
/// Constructor |
| 78 |
explicit IoError(const std::string &message) {
|
|
| 78 |
explicit IoError(const std::string &message) throw() {
|
|
| 79 | 79 |
IoError::message(message); |
| 80 | 80 |
} |
| 81 | 81 |
|
| 82 | 82 |
/// Constructor |
| 83 |
IoError( |
|
| 83 |
explicit IoError(const char *message, |
|
| 84 |
const std::string &file) throw() {
|
|
| 84 | 85 |
IoError::message(message); |
| 85 | 86 |
IoError::file(file); |
| 86 | 87 |
} |
| 87 | 88 |
|
| 88 | 89 |
/// Constructor |
| 89 |
IoError(const std::string & |
|
| 90 |
explicit IoError(const std::string &message, |
|
| 91 |
const std::string &file) throw() {
|
|
| 90 | 92 |
IoError::message(message); |
| 91 | 93 |
IoError::file(file); |
| 92 | 94 |
} |
| ... | ... |
@@ -95,53 +97,50 @@ |
| 95 | 97 |
virtual ~IoError() throw() {}
|
| 96 | 98 |
|
| 97 | 99 |
/// Set the error message |
| 98 |
void message(const char *message) {
|
|
| 100 |
void message(const char *message) throw() {
|
|
| 99 | 101 |
try {
|
| 100 | 102 |
_message = message; |
| 101 | 103 |
} catch (...) {}
|
| 102 | 104 |
} |
| 103 | 105 |
|
| 104 | 106 |
/// Set the error message |
| 105 |
void message(const std::string& message) {
|
|
| 107 |
void message(const std::string& message) throw() {
|
|
| 106 | 108 |
try {
|
| 107 | 109 |
_message = message; |
| 108 | 110 |
} catch (...) {}
|
| 109 | 111 |
} |
| 110 | 112 |
|
| 111 | 113 |
/// Set the file name |
| 112 |
void file(const std::string &file) {
|
|
| 114 |
void file(const std::string &file) throw() {
|
|
| 113 | 115 |
try {
|
| 114 | 116 |
_file = file; |
| 115 | 117 |
} catch (...) {}
|
| 116 | 118 |
} |
| 117 | 119 |
|
| 118 | 120 |
/// Returns the error message |
| 119 |
const std::string& message() const {
|
|
| 121 |
const std::string& message() const throw() {
|
|
| 120 | 122 |
return _message; |
| 121 | 123 |
} |
| 122 | 124 |
|
| 123 | 125 |
/// \brief Returns the filename |
| 124 | 126 |
/// |
| 125 |
/// Returns the filename or empty string if the filename was not |
|
| 126 |
/// specified. |
|
| 127 |
|
|
| 127 |
/// Returns the filename or an empty string if it was not specified. |
|
| 128 |
const std::string& file() const throw() {
|
|
| 128 | 129 |
return _file; |
| 129 | 130 |
} |
| 130 | 131 |
|
| 131 | 132 |
/// \brief Returns a short error message |
| 132 | 133 |
/// |
| 133 |
/// Returns a short error message which contains the message, the |
|
| 134 |
/// file name and the line number. |
|
| 134 |
/// Returns a short error message which contains the message and the |
|
| 135 |
/// file name. |
|
| 135 | 136 |
virtual const char* what() const throw() {
|
| 136 | 137 |
try {
|
| 137 | 138 |
_what.clear(); |
| 138 | 139 |
std::ostringstream oss; |
| 139 | 140 |
oss << "lemon:IoError" << ": "; |
| 140 |
oss << message(); |
|
| 141 |
if (!file().empty()) {
|
|
| 142 |
oss << " (";
|
|
| 143 |
if (!file().empty()) oss << "with file '" << file() << "'"; |
|
| 144 |
|
|
| 141 |
oss << _message; |
|
| 142 |
if (!_file.empty()) {
|
|
| 143 |
oss << " ('" << _file << "')";
|
|
| 145 | 144 |
} |
| 146 | 145 |
_what = oss.str(); |
| 147 | 146 |
} |
| ... | ... |
@@ -154,8 +153,8 @@ |
| 154 | 153 |
|
| 155 | 154 |
/// \brief Format error |
| 156 | 155 |
/// |
| 157 |
/// This class is used to indicate if an input file has wrong |
|
| 158 |
/// formatting, or a data representation is not legal. |
|
| 156 |
/// This exception is thrown when an input file has wrong |
|
| 157 |
/// format or a data representation is not legal. |
|
| 159 | 158 |
class FormatError : public Exception {
|
| 160 | 159 |
protected: |
| 161 | 160 |
std::string _message; |
| ... | ... |
@@ -166,33 +165,35 @@ |
| 166 | 165 |
public: |
| 167 | 166 |
|
| 168 | 167 |
/// Copy constructor |
| 169 |
FormatError(const FormatError &error) {
|
|
| 168 |
FormatError(const FormatError &error) throw() : Exception() {
|
|
| 170 | 169 |
message(error._message); |
| 171 | 170 |
file(error._file); |
| 172 | 171 |
line(error._line); |
| 173 | 172 |
} |
| 174 | 173 |
|
| 175 | 174 |
/// Constructor |
| 176 |
explicit FormatError(const char *message) {
|
|
| 175 |
explicit FormatError(const char *message) throw() {
|
|
| 177 | 176 |
FormatError::message(message); |
| 178 | 177 |
_line = 0; |
| 179 | 178 |
} |
| 180 | 179 |
|
| 181 | 180 |
/// Constructor |
| 182 |
explicit FormatError(const std::string &message) {
|
|
| 181 |
explicit FormatError(const std::string &message) throw() {
|
|
| 183 | 182 |
FormatError::message(message); |
| 184 | 183 |
_line = 0; |
| 185 | 184 |
} |
| 186 | 185 |
|
| 187 | 186 |
/// Constructor |
| 188 |
FormatError( |
|
| 187 |
explicit FormatError(const char *message, |
|
| 188 |
const std::string &file, int line = 0) throw() {
|
|
| 189 | 189 |
FormatError::message(message); |
| 190 | 190 |
FormatError::file(file); |
| 191 | 191 |
FormatError::line(line); |
| 192 | 192 |
} |
| 193 | 193 |
|
| 194 | 194 |
/// Constructor |
| 195 |
FormatError(const std::string & |
|
| 195 |
explicit FormatError(const std::string &message, |
|
| 196 |
const std::string &file, int line = 0) throw() {
|
|
| 196 | 197 |
FormatError::message(message); |
| 197 | 198 |
FormatError::file(file); |
| 198 | 199 |
FormatError::line(line); |
| ... | ... |
@@ -202,24 +203,24 @@ |
| 202 | 203 |
virtual ~FormatError() throw() {}
|
| 203 | 204 |
|
| 204 | 205 |
/// Set the line number |
| 205 |
void line(int line) { _line = line; }
|
|
| 206 |
void line(int line) throw() { _line = line; }
|
|
| 206 | 207 |
|
| 207 | 208 |
/// Set the error message |
| 208 |
void message(const char *message) {
|
|
| 209 |
void message(const char *message) throw() {
|
|
| 209 | 210 |
try {
|
| 210 | 211 |
_message = message; |
| 211 | 212 |
} catch (...) {}
|
| 212 | 213 |
} |
| 213 | 214 |
|
| 214 | 215 |
/// Set the error message |
| 215 |
void message(const std::string& message) {
|
|
| 216 |
void message(const std::string& message) throw() {
|
|
| 216 | 217 |
try {
|
| 217 | 218 |
_message = message; |
| 218 | 219 |
} catch (...) {}
|
| 219 | 220 |
} |
| 220 | 221 |
|
| 221 | 222 |
/// Set the file name |
| 222 |
void file(const std::string &file) {
|
|
| 223 |
void file(const std::string &file) throw() {
|
|
| 223 | 224 |
try {
|
| 224 | 225 |
_file = file; |
| 225 | 226 |
} catch (...) {}
|
| ... | ... |
@@ -228,18 +229,17 @@ |
| 228 | 229 |
/// \brief Returns the line number |
| 229 | 230 |
/// |
| 230 | 231 |
/// Returns the line number or zero if it was not specified. |
| 231 |
int line() const { return _line; }
|
|
| 232 |
int line() const throw() { return _line; }
|
|
| 232 | 233 |
|
| 233 | 234 |
/// Returns the error message |
| 234 |
const std::string& message() const {
|
|
| 235 |
const std::string& message() const throw() {
|
|
| 235 | 236 |
return _message; |
| 236 | 237 |
} |
| 237 | 238 |
|
| 238 | 239 |
/// \brief Returns the filename |
| 239 | 240 |
/// |
| 240 |
/// Returns the filename or empty string if the filename was not |
|
| 241 |
/// specified. |
|
| 242 |
|
|
| 241 |
/// Returns the filename or an empty string if it was not specified. |
|
| 242 |
const std::string& file() const throw() {
|
|
| 243 | 243 |
return _file; |
| 244 | 244 |
} |
| 245 | 245 |
|
| ... | ... |
@@ -252,12 +252,12 @@ |
| 252 | 252 |
_what.clear(); |
| 253 | 253 |
std::ostringstream oss; |
| 254 | 254 |
oss << "lemon:FormatError" << ": "; |
| 255 |
oss << message(); |
|
| 256 |
if (!file().empty() || line() != 0) {
|
|
| 255 |
oss << _message; |
|
| 256 |
if (!_file.empty() || _line != 0) {
|
|
| 257 | 257 |
oss << " (";
|
| 258 |
if (!file().empty()) oss << "in file '" << file() << "'"; |
|
| 259 |
if (!file().empty() && line() != 0) oss << " "; |
|
| 260 |
if ( |
|
| 258 |
if (!_file.empty()) oss << "in file '" << _file << "'"; |
|
| 259 |
if (!_file.empty() && _line != 0) oss << " "; |
|
| 260 |
if (_line != 0) oss << "at line " << _line; |
|
| 261 | 261 |
oss << ")"; |
| 262 | 262 |
} |
| 263 | 263 |
_what = oss.str(); |
| ... | ... |
@@ -1170,7 +1170,7 @@ |
| 1170 | 1170 |
std::ostream* os = new std::ofstream(file_name); |
| 1171 | 1171 |
if (!(*os)) {
|
| 1172 | 1172 |
delete os; |
| 1173 |
throw IoError( |
|
| 1173 |
throw IoError("Cannot write file", file_name);
|
|
| 1174 | 1174 |
} |
| 1175 | 1175 |
return GraphToEps<DefaultGraphToEpsTraits<G> > |
| 1176 | 1176 |
(DefaultGraphToEpsTraits<G>(g,*os,true)); |
| ... | ... |
@@ -1191,7 +1191,7 @@ |
| 1191 | 1191 |
std::ostream* os = new std::ofstream(file_name.c_str()); |
| 1192 | 1192 |
if (!(*os)) {
|
| 1193 | 1193 |
delete os; |
| 1194 |
throw IoError( |
|
| 1194 |
throw IoError("Cannot write file", file_name);
|
|
| 1195 | 1195 |
} |
| 1196 | 1196 |
return GraphToEps<DefaultGraphToEpsTraits<G> > |
| 1197 | 1197 |
(DefaultGraphToEpsTraits<G>(g,*os,true)); |
| ... | ... |
@@ -516,7 +516,7 @@ |
| 516 | 516 |
_filename(fn), _digraph(digraph), |
| 517 | 517 |
_use_nodes(false), _use_arcs(false), |
| 518 | 518 |
_skip_nodes(false), _skip_arcs(false) {
|
| 519 |
if (!(*_is)) throw IoError( |
|
| 519 |
if (!(*_is)) throw IoError("Cannot open file", fn);
|
|
| 520 | 520 |
} |
| 521 | 521 |
|
| 522 | 522 |
/// \brief Constructor |
| ... | ... |
@@ -528,7 +528,7 @@ |
| 528 | 528 |
_filename(fn), _digraph(digraph), |
| 529 | 529 |
_use_nodes(false), _use_arcs(false), |
| 530 | 530 |
_skip_nodes(false), _skip_arcs(false) {
|
| 531 |
if (!(*_is)) throw IoError( |
|
| 531 |
if (!(*_is)) throw IoError("Cannot open file", fn);
|
|
| 532 | 532 |
} |
| 533 | 533 |
|
| 534 | 534 |
/// \brief Destructor |
| ... | ... |
@@ -879,7 +879,7 @@ |
| 879 | 879 |
maps.find(_node_maps[i].first); |
| 880 | 880 |
if (jt == maps.end()) {
|
| 881 | 881 |
std::ostringstream msg; |
| 882 |
msg << "Map not found |
|
| 882 |
msg << "Map not found: " << _node_maps[i].first; |
|
| 883 | 883 |
throw FormatError(msg.str()); |
| 884 | 884 |
} |
| 885 | 885 |
map_index[i] = jt->second; |
| ... | ... |
@@ -908,7 +908,7 @@ |
| 908 | 908 |
} |
| 909 | 909 |
} |
| 910 | 910 |
if (line >> std::ws >> c) |
| 911 |
throw FormatError("Extra character
|
|
| 911 |
throw FormatError("Extra character at the end of line");
|
|
| 912 | 912 |
|
| 913 | 913 |
Node n; |
| 914 | 914 |
if (!_use_nodes) {
|
| ... | ... |
@@ -917,7 +917,7 @@ |
| 917 | 917 |
_node_index.insert(std::make_pair(tokens[label_index], n)); |
| 918 | 918 |
} else {
|
| 919 | 919 |
if (label_index == -1) |
| 920 |
throw FormatError("Label map not found
|
|
| 920 |
throw FormatError("Label map not found");
|
|
| 921 | 921 |
typename std::map<std::string, Node>::iterator it = |
| 922 | 922 |
_node_index.find(tokens[label_index]); |
| 923 | 923 |
if (it == _node_index.end()) {
|
| ... | ... |
@@ -972,7 +972,7 @@ |
| 972 | 972 |
maps.find(_arc_maps[i].first); |
| 973 | 973 |
if (jt == maps.end()) {
|
| 974 | 974 |
std::ostringstream msg; |
| 975 |
msg << "Map not found |
|
| 975 |
msg << "Map not found: " << _arc_maps[i].first; |
|
| 976 | 976 |
throw FormatError(msg.str()); |
| 977 | 977 |
} |
| 978 | 978 |
map_index[i] = jt->second; |
| ... | ... |
@@ -1010,7 +1010,7 @@ |
| 1010 | 1010 |
} |
| 1011 | 1011 |
} |
| 1012 | 1012 |
if (line >> std::ws >> c) |
| 1013 |
throw FormatError("Extra character
|
|
| 1013 |
throw FormatError("Extra character at the end of line");
|
|
| 1014 | 1014 |
|
| 1015 | 1015 |
Arc a; |
| 1016 | 1016 |
if (!_use_arcs) {
|
| ... | ... |
@@ -1038,7 +1038,7 @@ |
| 1038 | 1038 |
_arc_index.insert(std::make_pair(tokens[label_index], a)); |
| 1039 | 1039 |
} else {
|
| 1040 | 1040 |
if (label_index == -1) |
| 1041 |
throw FormatError("Label map not found
|
|
| 1041 |
throw FormatError("Label map not found");
|
|
| 1042 | 1042 |
typename std::map<std::string, Arc>::iterator it = |
| 1043 | 1043 |
_arc_index.find(tokens[label_index]); |
| 1044 | 1044 |
if (it == _arc_index.end()) {
|
| ... | ... |
@@ -1073,13 +1073,13 @@ |
| 1073 | 1073 |
if (!_reader_bits::readToken(line, token)) |
| 1074 | 1074 |
throw FormatError("Attribute value not found");
|
| 1075 | 1075 |
if (line >> c) |
| 1076 |
throw FormatError("Extra character
|
|
| 1076 |
throw FormatError("Extra character at the end of line");
|
|
| 1077 | 1077 |
|
| 1078 | 1078 |
{
|
| 1079 | 1079 |
std::set<std::string>::iterator it = read_attr.find(attr); |
| 1080 | 1080 |
if (it != read_attr.end()) {
|
| 1081 | 1081 |
std::ostringstream msg; |
| 1082 |
msg << "Multiple occurence of attribute " << attr; |
|
| 1082 |
msg << "Multiple occurence of attribute: " << attr; |
|
| 1083 | 1083 |
throw FormatError(msg.str()); |
| 1084 | 1084 |
} |
| 1085 | 1085 |
read_attr.insert(attr); |
| ... | ... |
@@ -1101,7 +1101,7 @@ |
| 1101 | 1101 |
it != _attributes.end(); ++it) {
|
| 1102 | 1102 |
if (read_attr.find(it->first) == read_attr.end()) {
|
| 1103 | 1103 |
std::ostringstream msg; |
| 1104 |
msg << "Attribute not found |
|
| 1104 |
msg << "Attribute not found: " << it->first; |
|
| 1105 | 1105 |
throw FormatError(msg.str()); |
| 1106 | 1106 |
} |
| 1107 | 1107 |
} |
| ... | ... |
@@ -1117,9 +1117,6 @@ |
| 1117 | 1117 |
/// This function starts the batch processing |
| 1118 | 1118 |
void run() {
|
| 1119 | 1119 |
LEMON_ASSERT(_is != 0, "This reader assigned to an other reader"); |
| 1120 |
if (!*_is) {
|
|
| 1121 |
throw FormatError("Cannot find file");
|
|
| 1122 |
} |
|
| 1123 | 1120 |
|
| 1124 | 1121 |
bool nodes_done = _skip_nodes; |
| 1125 | 1122 |
bool arcs_done = _skip_arcs; |
| ... | ... |
@@ -1138,7 +1135,7 @@ |
| 1138 | 1135 |
_reader_bits::readToken(line, caption); |
| 1139 | 1136 |
|
| 1140 | 1137 |
if (line >> c) |
| 1141 |
throw FormatError("Extra character
|
|
| 1138 |
throw FormatError("Extra character at the end of line");
|
|
| 1142 | 1139 |
|
| 1143 | 1140 |
if (section == "nodes" && !nodes_done) {
|
| 1144 | 1141 |
if (_nodes_caption.empty() || _nodes_caption == caption) {
|
| ... | ... |
@@ -1308,7 +1305,7 @@ |
| 1308 | 1305 |
_filename(fn), _graph(graph), |
| 1309 | 1306 |
_use_nodes(false), _use_edges(false), |
| 1310 | 1307 |
_skip_nodes(false), _skip_edges(false) {
|
| 1311 |
if (!(*_is)) throw IoError( |
|
| 1308 |
if (!(*_is)) throw IoError("Cannot open file", fn);
|
|
| 1312 | 1309 |
} |
| 1313 | 1310 |
|
| 1314 | 1311 |
/// \brief Constructor |
| ... | ... |
@@ -1320,7 +1317,7 @@ |
| 1320 | 1317 |
_filename(fn), _graph(graph), |
| 1321 | 1318 |
_use_nodes(false), _use_edges(false), |
| 1322 | 1319 |
_skip_nodes(false), _skip_edges(false) {
|
| 1323 |
if (!(*_is)) throw IoError( |
|
| 1320 |
if (!(*_is)) throw IoError("Cannot open file", fn);
|
|
| 1324 | 1321 |
} |
| 1325 | 1322 |
|
| 1326 | 1323 |
/// \brief Destructor |
| ... | ... |
@@ -1715,7 +1712,7 @@ |
| 1715 | 1712 |
maps.find(_node_maps[i].first); |
| 1716 | 1713 |
if (jt == maps.end()) {
|
| 1717 | 1714 |
std::ostringstream msg; |
| 1718 |
msg << "Map not found |
|
| 1715 |
msg << "Map not found: " << _node_maps[i].first; |
|
| 1719 | 1716 |
throw FormatError(msg.str()); |
| 1720 | 1717 |
} |
| 1721 | 1718 |
map_index[i] = jt->second; |
| ... | ... |
@@ -1744,7 +1741,7 @@ |
| 1744 | 1741 |
} |
| 1745 | 1742 |
} |
| 1746 | 1743 |
if (line >> std::ws >> c) |
| 1747 |
throw FormatError("Extra character
|
|
| 1744 |
throw FormatError("Extra character at the end of line");
|
|
| 1748 | 1745 |
|
| 1749 | 1746 |
Node n; |
| 1750 | 1747 |
if (!_use_nodes) {
|
| ... | ... |
@@ -1753,7 +1750,7 @@ |
| 1753 | 1750 |
_node_index.insert(std::make_pair(tokens[label_index], n)); |
| 1754 | 1751 |
} else {
|
| 1755 | 1752 |
if (label_index == -1) |
| 1756 |
throw FormatError("Label map not found
|
|
| 1753 |
throw FormatError("Label map not found");
|
|
| 1757 | 1754 |
typename std::map<std::string, Node>::iterator it = |
| 1758 | 1755 |
_node_index.find(tokens[label_index]); |
| 1759 | 1756 |
if (it == _node_index.end()) {
|
| ... | ... |
@@ -1808,7 +1805,7 @@ |
| 1808 | 1805 |
maps.find(_edge_maps[i].first); |
| 1809 | 1806 |
if (jt == maps.end()) {
|
| 1810 | 1807 |
std::ostringstream msg; |
| 1811 |
msg << "Map not found |
|
| 1808 |
msg << "Map not found: " << _edge_maps[i].first; |
|
| 1812 | 1809 |
throw FormatError(msg.str()); |
| 1813 | 1810 |
} |
| 1814 | 1811 |
map_index[i] = jt->second; |
| ... | ... |
@@ -1846,7 +1843,7 @@ |
| 1846 | 1843 |
} |
| 1847 | 1844 |
} |
| 1848 | 1845 |
if (line >> std::ws >> c) |
| 1849 |
throw FormatError("Extra character
|
|
| 1846 |
throw FormatError("Extra character at the end of line");
|
|
| 1850 | 1847 |
|
| 1851 | 1848 |
Edge e; |
| 1852 | 1849 |
if (!_use_edges) {
|
| ... | ... |
@@ -1874,7 +1871,7 @@ |
| 1874 | 1871 |
_edge_index.insert(std::make_pair(tokens[label_index], e)); |
| 1875 | 1872 |
} else {
|
| 1876 | 1873 |
if (label_index == -1) |
| 1877 |
throw FormatError("Label map not found
|
|
| 1874 |
throw FormatError("Label map not found");
|
|
| 1878 | 1875 |
typename std::map<std::string, Edge>::iterator it = |
| 1879 | 1876 |
_edge_index.find(tokens[label_index]); |
| 1880 | 1877 |
if (it == _edge_index.end()) {
|
| ... | ... |
@@ -1909,13 +1906,13 @@ |
| 1909 | 1906 |
if (!_reader_bits::readToken(line, token)) |
| 1910 | 1907 |
throw FormatError("Attribute value not found");
|
| 1911 | 1908 |
if (line >> c) |
| 1912 |
throw FormatError("Extra character
|
|
| 1909 |
throw FormatError("Extra character at the end of line");
|
|
| 1913 | 1910 |
|
| 1914 | 1911 |
{
|
| 1915 | 1912 |
std::set<std::string>::iterator it = read_attr.find(attr); |
| 1916 | 1913 |
if (it != read_attr.end()) {
|
| 1917 | 1914 |
std::ostringstream msg; |
| 1918 |
msg << "Multiple occurence of attribute " << attr; |
|
| 1915 |
msg << "Multiple occurence of attribute: " << attr; |
|
| 1919 | 1916 |
throw FormatError(msg.str()); |
| 1920 | 1917 |
} |
| 1921 | 1918 |
read_attr.insert(attr); |
| ... | ... |
@@ -1937,7 +1934,7 @@ |
| 1937 | 1934 |
it != _attributes.end(); ++it) {
|
| 1938 | 1935 |
if (read_attr.find(it->first) == read_attr.end()) {
|
| 1939 | 1936 |
std::ostringstream msg; |
| 1940 |
msg << "Attribute not found |
|
| 1937 |
msg << "Attribute not found: " << it->first; |
|
| 1941 | 1938 |
throw FormatError(msg.str()); |
| 1942 | 1939 |
} |
| 1943 | 1940 |
} |
| ... | ... |
@@ -1972,7 +1969,7 @@ |
| 1972 | 1969 |
_reader_bits::readToken(line, caption); |
| 1973 | 1970 |
|
| 1974 | 1971 |
if (line >> c) |
| 1975 |
throw FormatError("Extra character
|
|
| 1972 |
throw FormatError("Extra character at the end of line");
|
|
| 1976 | 1973 |
|
| 1977 | 1974 |
if (section == "nodes" && !nodes_done) {
|
| 1978 | 1975 |
if (_nodes_caption.empty() || _nodes_caption == caption) {
|
| ... | ... |
@@ -2095,7 +2092,7 @@ |
| 2095 | 2092 |
SectionReader(const std::string& fn) |
| 2096 | 2093 |
: _is(new std::ifstream(fn.c_str())), local_is(true), |
| 2097 | 2094 |
_filename(fn) {
|
| 2098 |
if (!(*_is)) throw IoError( |
|
| 2095 |
if (!(*_is)) throw IoError("Cannot open file", fn);
|
|
| 2099 | 2096 |
} |
| 2100 | 2097 |
|
| 2101 | 2098 |
/// \brief Constructor |
| ... | ... |
@@ -2104,7 +2101,7 @@ |
| 2104 | 2101 |
SectionReader(const char* fn) |
| 2105 | 2102 |
: _is(new std::ifstream(fn)), local_is(true), |
| 2106 | 2103 |
_filename(fn) {
|
| 2107 |
if (!(*_is)) throw IoError( |
|
| 2104 |
if (!(*_is)) throw IoError("Cannot open file", fn);
|
|
| 2108 | 2105 |
} |
| 2109 | 2106 |
|
| 2110 | 2107 |
/// \brief Destructor |
| ... | ... |
@@ -2261,11 +2258,11 @@ |
| 2261 | 2258 |
_reader_bits::readToken(line, caption); |
| 2262 | 2259 |
|
| 2263 | 2260 |
if (line >> c) |
| 2264 |
throw FormatError("Extra character
|
|
| 2261 |
throw FormatError("Extra character at the end of line");
|
|
| 2265 | 2262 |
|
| 2266 | 2263 |
if (extra_sections.find(section) != extra_sections.end()) {
|
| 2267 | 2264 |
std::ostringstream msg; |
| 2268 |
msg << "Multiple occurence of section " << section; |
|
| 2265 |
msg << "Multiple occurence of section: " << section; |
|
| 2269 | 2266 |
throw FormatError(msg.str()); |
| 2270 | 2267 |
} |
| 2271 | 2268 |
Sections::iterator it = _sections.find(section); |
| ... | ... |
@@ -2387,7 +2384,7 @@ |
| 2387 | 2384 |
/// file. |
| 2388 | 2385 |
LgfContents(const std::string& fn) |
| 2389 | 2386 |
: _is(new std::ifstream(fn.c_str())), local_is(true) {
|
| 2390 |
if (!(*_is)) throw IoError( |
|
| 2387 |
if (!(*_is)) throw IoError("Cannot open file", fn);
|
|
| 2391 | 2388 |
} |
| 2392 | 2389 |
|
| 2393 | 2390 |
/// \brief Constructor |
| ... | ... |
@@ -2396,7 +2393,7 @@ |
| 2396 | 2393 |
/// file. |
| 2397 | 2394 |
LgfContents(const char* fn) |
| 2398 | 2395 |
: _is(new std::ifstream(fn)), local_is(true) {
|
| 2399 |
if (!(*_is)) throw IoError( |
|
| 2396 |
if (!(*_is)) throw IoError("Cannot open file", fn);
|
|
| 2400 | 2397 |
} |
| 2401 | 2398 |
|
| 2402 | 2399 |
/// \brief Destructor |
| ... | ... |
@@ -463,7 +463,7 @@ |
| 463 | 463 |
DigraphWriter(const std::string& fn, const Digraph& digraph) |
| 464 | 464 |
: _os(new std::ofstream(fn.c_str())), local_os(true), _digraph(digraph), |
| 465 | 465 |
_skip_nodes(false), _skip_arcs(false) {
|
| 466 |
if (!(*_os)) throw IoError( |
|
| 466 |
if (!(*_os)) throw IoError("Cannot write file", fn);
|
|
| 467 | 467 |
} |
| 468 | 468 |
|
| 469 | 469 |
/// \brief Constructor |
| ... | ... |
@@ -473,7 +473,7 @@ |
| 473 | 473 |
DigraphWriter(const char* fn, const Digraph& digraph) |
| 474 | 474 |
: _os(new std::ofstream(fn)), local_os(true), _digraph(digraph), |
| 475 | 475 |
_skip_nodes(false), _skip_arcs(false) {
|
| 476 |
if (!(*_os)) throw IoError( |
|
| 476 |
if (!(*_os)) throw IoError("Cannot write file", fn);
|
|
| 477 | 477 |
} |
| 478 | 478 |
|
| 479 | 479 |
/// \brief Destructor |
| ... | ... |
@@ -1023,7 +1023,7 @@ |
| 1023 | 1023 |
GraphWriter(const std::string& fn, const Graph& graph) |
| 1024 | 1024 |
: _os(new std::ofstream(fn.c_str())), local_os(true), _graph(graph), |
| 1025 | 1025 |
_skip_nodes(false), _skip_edges(false) {
|
| 1026 |
if (!(*_os)) throw IoError( |
|
| 1026 |
if (!(*_os)) throw IoError("Cannot write file", fn);
|
|
| 1027 | 1027 |
} |
| 1028 | 1028 |
|
| 1029 | 1029 |
/// \brief Constructor |
| ... | ... |
@@ -1033,7 +1033,7 @@ |
| 1033 | 1033 |
GraphWriter(const char* fn, const Graph& graph) |
| 1034 | 1034 |
: _os(new std::ofstream(fn)), local_os(true), _graph(graph), |
| 1035 | 1035 |
_skip_nodes(false), _skip_edges(false) {
|
| 1036 |
if (!(*_os)) throw IoError( |
|
| 1036 |
if (!(*_os)) throw IoError("Cannot write file", fn);
|
|
| 1037 | 1037 |
} |
| 1038 | 1038 |
|
| 1039 | 1039 |
/// \brief Destructor |
| ... | ... |
@@ -1585,7 +1585,7 @@ |
| 1585 | 1585 |
/// Construct a section writer, which writes into the given file. |
| 1586 | 1586 |
SectionWriter(const std::string& fn) |
| 1587 | 1587 |
: _os(new std::ofstream(fn.c_str())), local_os(true) {
|
| 1588 |
if (!(*_os)) throw IoError( |
|
| 1588 |
if (!(*_os)) throw IoError("Cannot write file", fn);
|
|
| 1589 | 1589 |
} |
| 1590 | 1590 |
|
| 1591 | 1591 |
/// \brief Constructor |
| ... | ... |
@@ -1593,7 +1593,7 @@ |
| 1593 | 1593 |
/// Construct a section writer, which writes into the given file. |
| 1594 | 1594 |
SectionWriter(const char* fn) |
| 1595 | 1595 |
: _os(new std::ofstream(fn)), local_os(true) {
|
| 1596 |
if (!(*_os)) throw IoError( |
|
| 1596 |
if (!(*_os)) throw IoError("Cannot write file", fn);
|
|
| 1597 | 1597 |
} |
| 1598 | 1598 |
|
| 1599 | 1599 |
/// \brief Destructor |
0 comments (0 inline)