LEMON/LEMON-main Changeset - r291:d901321d6555

Repositories » LEMON » LEMON-main

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r291:d901321d6555

« 290:f68999

292:e7af73 »

r291:d901321d6555

Wed, 01 Oct 2008 11:58:03

[Not Reviewed]

0 comments (0 inline)

kpeter (Peter Kovacs)
kpeter@inf.elte.hu

Changing parameter order in exception classes + improvements

0 4 0

default

4 files changed with 82 insertions and 85 deletions:

lemon/error.h

lemon/graph_to_eps.h

lemon/lgf_reader.h

lemon/lgf_writer.h

↑ Collapse diff ↑

lemon/error.h

Show inline comments

@@ -43,7 +43,7 @@
 		  public:
 		    ///\e Constructor
 		    Exception() {}
-		    ///\e Virtual destructor
+		    ///Constructor
 		    Exception() throw() {}
 		    ///Virtual destructor
 		    virtual ~Exception() throw() {}
-		    ///\e A short description of the exception
 		    ///A short description of the exception
 		    virtual const char* what() const throw() {
@@ -66,3 +66,3 @@
 		    /// Copy constructor
 		    IoError(const IoError &error) {
+		    IoError(const IoError &error) throw() : Exception() {
 		      message(error._message);
@@ -72,3 +72,3 @@
 		    /// Constructor
 		    explicit IoError(const char *message) {
+		    explicit IoError(const char *message) throw() {
 		      IoError::message(message);
@@ -77,3 +77,3 @@
 		    /// Constructor
 		    explicit IoError(const std::string &message) {
+		    explicit IoError(const std::string &message) throw() {
 		      IoError::message(message);
@@ -82,3 +82,4 @@
 		    /// Constructor
-		    IoError(const std::string &file, const char *message) {
+		    explicit IoError(const char *message,
 		                     const std::string &file) throw() {
 		      IoError::message(message);
@@ -88,3 +89,4 @@
 		    /// Constructor
-		    IoError(const std::string &file, const std::string &message) {
+		    explicit IoError(const std::string &message,
 		                     const std::string &file) throw() {
 		      IoError::message(message);
@@ -97,3 +99,3 @@
 		    /// Set the error message
 		    void message(const char *message) {
+		    void message(const char *message) throw() {
 		      try {
@@ -104,3 +106,3 @@
 		    /// Set the error message
 		    void message(const std::string& message) {
+		    void message(const std::string& message) throw() {
 		      try {
@@ -111,3 +113,3 @@
 		    /// Set the file name
 		    void file(const std::string &file) {
+		    void file(const std::string &file) throw() {
 		      try {
@@ -118,3 +120,3 @@
 		    /// Returns the error message
 		    const std::string& message() const {
+		    const std::string& message() const throw() {
 		      return _message;
@@ -124,5 +126,4 @@
 		    ///
 		    /// Returns the filename or empty string if the filename was not
 		    /// specified.
-		    const std::string& file() const {
+		    /// Returns the filename or an empty string if it was not specified.
 		    const std::string& file() const throw() {
 		      return _file;
@@ -132,4 +133,4 @@
 		    ///
 		    /// Returns a short error message which contains the message, the
 		    /// file name and the line number.
 		    /// Returns a short error message which contains the message and the
 		    /// file name.
 		    virtual const char* what() const throw() {
@@ -139,7 +140,5 @@
 		        oss << "lemon:IoError" << ": ";
 		        oss << message();
 		        if (!file().empty()) {
 		          oss << " (";
 		          if (!file().empty()) oss << "with file '" << file() << "'";
-		          oss << ")";
+		        oss << _message;
 		        if (!_file.empty()) {
 		          oss << " ('" << _file << "')";
+		        }
@@ -156,4 +155,4 @@
 		  ///
 		  /// This class is used to indicate if an input file has wrong
 		  /// formatting, or a data representation is not legal.
 		  /// This exception is thrown when an input file has wrong
 		  /// format or a data representation is not legal.
 		  class FormatError : public Exception {
@@ -168,3 +167,3 @@
 		    /// Copy constructor
 		    FormatError(const FormatError &error) {
+		    FormatError(const FormatError &error) throw() : Exception() {
 		      message(error._message);
@@ -175,3 +174,3 @@
 		    /// Constructor
 		    explicit FormatError(const char *message) {
+		    explicit FormatError(const char *message) throw() {
 		      FormatError::message(message);
@@ -181,3 +180,3 @@
 		    /// Constructor
 		    explicit FormatError(const std::string &message) {
+		    explicit FormatError(const std::string &message) throw() {
 		      FormatError::message(message);
@@ -187,3 +186,4 @@
 		    /// Constructor
-		    FormatError(const std::string &file, int line, const char *message) {
+		    explicit FormatError(const char *message,
 		                         const std::string &file, int line = 0) throw() {
 		      FormatError::message(message);
@@ -194,3 +194,4 @@
 		    /// Constructor
-		    FormatError(const std::string &file, int line, const std::string &message) {
+		    explicit FormatError(const std::string &message,
 		                         const std::string &file, int line = 0) throw() {
 		      FormatError::message(message);
@@ -204,6 +205,6 @@
 		    /// Set the line number
 		    void line(int line) { _line = line; }
+		    void line(int line) throw() { _line = line; }
 		    /// Set the error message
 		    void message(const char *message) {
+		    void message(const char *message) throw() {
 		      try {
@@ -214,3 +215,3 @@
 		    /// Set the error message
 		    void message(const std::string& message) {
+		    void message(const std::string& message) throw() {
 		      try {
@@ -221,3 +222,3 @@
 		    /// Set the file name
 		    void file(const std::string &file) {
+		    void file(const std::string &file) throw() {
 		      try {
@@ -230,6 +231,6 @@
 		    /// Returns the line number or zero if it was not specified.
 		    int line() const { return _line; }
+		    int line() const throw() { return _line; }
 		    /// Returns the error message
 		    const std::string& message() const {
+		    const std::string& message() const throw() {
 		      return _message;
@@ -239,5 +240,4 @@
 		    ///
 		    /// Returns the filename or empty string if the filename was not
 		    /// specified.
-		    const std::string& file() const {
+		    /// Returns the filename or an empty string if it was not specified.
 		    const std::string& file() const throw() {
 		      return _file;
@@ -254,8 +254,8 @@
 		        oss << "lemon:FormatError" << ": ";
 		        oss << message();
 		        if (!file().empty() || line() != 0) {
 		        oss << _message;
 		        if (!_file.empty() || _line != 0) {
 		          oss << " (";
 		          if (!file().empty()) oss << "in file '" << file() << "'";
 		          if (!file().empty() && line() != 0) oss << " ";
-		          if (line() != 0) oss << "at line " << line();
+		          if (!_file.empty()) oss << "in file '" << _file << "'";
 		          if (!_file.empty() && _line != 0) oss << " ";
 		          if (_line != 0) oss << "at line " << _line;
 		          oss << ")";

lemon/graph_to_eps.h

Show inline comments

@@ -1172,3 +1172,3 @@
 		    delete os;
-		    throw IoError(file_name, "Cannot write file");
+		    throw IoError("Cannot write file", file_name);
+		  }
@@ -1193,3 +1193,3 @@
 		    delete os;
-		    throw IoError(file_name, "Cannot write file");
+		    throw IoError("Cannot write file", file_name);
+		  }

lemon/lgf_reader.h

Show inline comments

@@ -518,3 +518,3 @@
 		        _skip_nodes(false), _skip_arcs(false) {
-		      if (!(*_is)) throw IoError(fn, "Cannot open file");
+		      if (!(*_is)) throw IoError("Cannot open file", fn);
+		    }
@@ -530,3 +530,3 @@
 		        _skip_nodes(false), _skip_arcs(false) {
-		      if (!(*_is)) throw IoError(fn, "Cannot open file");
+		      if (!(*_is)) throw IoError("Cannot open file", fn);
+		    }
@@ -881,3 +881,3 @@
 		            std::ostringstream msg;
-		            msg << "Map not found in file: " << _node_maps[i].first;
 		            msg << "Map not found: " << _node_maps[i].first;
 		            throw FormatError(msg.str());
@@ -910,3 +910,3 @@
 		        if (line >> std::ws >> c)
-		          throw FormatError("Extra character on the end of line");
+		          throw FormatError("Extra character at the end of line");
@@ -919,3 +919,3 @@
 		          if (label_index == -1)
-		            throw FormatError("Label map not found in file");
 		            throw FormatError("Label map not found");
 		          typename std::map<std::string, Node>::iterator it =
@@ -974,3 +974,3 @@
 		            std::ostringstream msg;
-		            msg << "Map not found in file: " << _arc_maps[i].first;
 		            msg << "Map not found: " << _arc_maps[i].first;
 		            throw FormatError(msg.str());
@@ -1012,3 +1012,3 @@
 		        if (line >> std::ws >> c)
-		          throw FormatError("Extra character on the end of line");
+		          throw FormatError("Extra character at the end of line");
@@ -1040,3 +1040,3 @@
 		          if (label_index == -1)
-		            throw FormatError("Label map not found in file");
 		            throw FormatError("Label map not found");
 		          typename std::map<std::string, Arc>::iterator it =
@@ -1075,3 +1075,3 @@
 		        if (line >> c)
-		          throw FormatError("Extra character on the end of line");
+		          throw FormatError("Extra character at the end of line");
@@ -1081,3 +1081,3 @@
 		            std::ostringstream msg;
 		            msg << "Multiple occurence of attribute " << attr;
+		            msg << "Multiple occurence of attribute: " << attr;
 		            throw FormatError(msg.str());
@@ -1103,3 +1103,3 @@
 		          std::ostringstream msg;
-		          msg << "Attribute not found in file: " << it->first;
 		          msg << "Attribute not found: " << it->first;
 		          throw FormatError(msg.str());
@@ -1119,5 +1119,2 @@
 		      LEMON_ASSERT(_is != 0, "This reader assigned to an other reader");
 		      if (!*_is) {
 		        throw FormatError("Cannot find file");
+		      }
@@ -1140,3 +1137,3 @@
 		          if (line >> c)
-		            throw FormatError("Extra character on the end of line");
+		            throw FormatError("Extra character at the end of line");
@@ -1310,3 +1307,3 @@
 		        _skip_nodes(false), _skip_edges(false) {
-		      if (!(*_is)) throw IoError(fn, "Cannot open file");
+		      if (!(*_is)) throw IoError("Cannot open file", fn);
+		    }
@@ -1322,3 +1319,3 @@
 		        _skip_nodes(false), _skip_edges(false) {
-		      if (!(*_is)) throw IoError(fn, "Cannot open file");
+		      if (!(*_is)) throw IoError("Cannot open file", fn);
+		    }
@@ -1717,3 +1714,3 @@
 		            std::ostringstream msg;
-		            msg << "Map not found in file: " << _node_maps[i].first;
 		            msg << "Map not found: " << _node_maps[i].first;
 		            throw FormatError(msg.str());
@@ -1746,3 +1743,3 @@
 		        if (line >> std::ws >> c)
-		          throw FormatError("Extra character on the end of line");
+		          throw FormatError("Extra character at the end of line");
@@ -1755,3 +1752,3 @@
 		          if (label_index == -1)
-		            throw FormatError("Label map not found in file");
 		            throw FormatError("Label map not found");
 		          typename std::map<std::string, Node>::iterator it =
@@ -1810,3 +1807,3 @@
 		            std::ostringstream msg;
-		            msg << "Map not found in file: " << _edge_maps[i].first;
 		            msg << "Map not found: " << _edge_maps[i].first;
 		            throw FormatError(msg.str());
@@ -1848,3 +1845,3 @@
 		        if (line >> std::ws >> c)
-		          throw FormatError("Extra character on the end of line");
+		          throw FormatError("Extra character at the end of line");
@@ -1876,3 +1873,3 @@
 		          if (label_index == -1)
-		            throw FormatError("Label map not found in file");
 		            throw FormatError("Label map not found");
 		          typename std::map<std::string, Edge>::iterator it =
@@ -1911,3 +1908,3 @@
 		        if (line >> c)
-		          throw FormatError("Extra character on the end of line");
+		          throw FormatError("Extra character at the end of line");
@@ -1917,3 +1914,3 @@
 		            std::ostringstream msg;
 		            msg << "Multiple occurence of attribute " << attr;
+		            msg << "Multiple occurence of attribute: " << attr;
 		            throw FormatError(msg.str());
@@ -1939,3 +1936,3 @@
 		          std::ostringstream msg;
-		          msg << "Attribute not found in file: " << it->first;
 		          msg << "Attribute not found: " << it->first;
 		          throw FormatError(msg.str());
@@ -1974,3 +1971,3 @@
 		          if (line >> c)
-		            throw FormatError("Extra character on the end of line");
+		            throw FormatError("Extra character at the end of line");
@@ -2097,3 +2094,3 @@
 		        _filename(fn) {
-		      if (!(*_is)) throw IoError(fn, "Cannot open file");
+		      if (!(*_is)) throw IoError("Cannot open file", fn);
+		    }
@@ -2106,3 +2103,3 @@
 		        _filename(fn) {
-		      if (!(*_is)) throw IoError(fn, "Cannot open file");
+		      if (!(*_is)) throw IoError("Cannot open file", fn);
+		    }
@@ -2263,3 +2260,3 @@
 		          if (line >> c)
-		            throw FormatError("Extra character on the end of line");
+		            throw FormatError("Extra character at the end of line");
@@ -2267,3 +2264,3 @@
 		            std::ostringstream msg;
 		            msg << "Multiple occurence of section " << section;
+		            msg << "Multiple occurence of section: " << section;
 		            throw FormatError(msg.str());
@@ -2389,3 +2386,3 @@
 		      : _is(new std::ifstream(fn.c_str())), local_is(true) {
-		      if (!(*_is)) throw IoError(fn, "Cannot open file");
+		      if (!(*_is)) throw IoError("Cannot open file", fn);
+		    }
@@ -2398,3 +2395,3 @@
 		      : _is(new std::ifstream(fn)), local_is(true) {
-		      if (!(*_is)) throw IoError(fn, "Cannot open file");
+		      if (!(*_is)) throw IoError("Cannot open file", fn);
+		    }

lemon/lgf_writer.h

Show inline comments

@@ -465,3 +465,3 @@
 		        _skip_nodes(false), _skip_arcs(false) {
-		      if (!(*_os)) throw IoError(fn, "Cannot write file");
+		      if (!(*_os)) throw IoError("Cannot write file", fn);
+		    }
@@ -475,3 +475,3 @@
 		        _skip_nodes(false), _skip_arcs(false) {
-		      if (!(*_os)) throw IoError(fn, "Cannot write file");
+		      if (!(*_os)) throw IoError("Cannot write file", fn);
+		    }
@@ -1025,3 +1025,3 @@
 		        _skip_nodes(false), _skip_edges(false) {
-		      if (!(*_os)) throw IoError(fn, "Cannot write file");
+		      if (!(*_os)) throw IoError("Cannot write file", fn);
+		    }
@@ -1035,3 +1035,3 @@
 		        _skip_nodes(false), _skip_edges(false) {
-		      if (!(*_os)) throw IoError(fn, "Cannot write file");
+		      if (!(*_os)) throw IoError("Cannot write file", fn);
+		    }
@@ -1587,3 +1587,3 @@
 		      : _os(new std::ofstream(fn.c_str())), local_os(true) {
-		      if (!(*_os)) throw IoError(fn, "Cannot write file");
+		      if (!(*_os)) throw IoError("Cannot write file", fn);
+		    }
@@ -1595,3 +1595,3 @@
 		      : _os(new std::ofstream(fn)), local_os(true) {
-		      if (!(*_os)) throw IoError(fn, "Cannot write file");
+		      if (!(*_os)) throw IoError("Cannot write file", fn);
+		    }

0 comments (0 inline)

RhodeCode

Login to your account