Changeset 2153:b1fb96088350 in lemon-0.x

Timestamp:

07/18/06 17:57:55 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2867

Message:

Better 'Naming Convention' conformance.

Location:

lemon

Files:

• error.h (modified) (7 diffs)
• lemon_reader.h (modified) (26 diffs)

lemon/error.h

@@ -236 +236 @@
 
   ///\e 
-  class IOError : public RuntimeError {
-  public:
-    virtual const char* what() const throw() {
-      return "lemon::IOError";
+  class IoError : public RuntimeError {
+  public:
+    virtual const char* what() const throw() {
+      return "lemon::IoError";
     }
   };
 
   ///\e 
-  class DataFormatError : public IOError {
+  class DataFormatError : public IoError {
   protected:
     ExceptionMember<std::string> _message;
@@ -254 +254 @@
 
     DataFormatError(const DataFormatError &dfe) : 
-      IOError(dfe), _message(dfe._message), _file(dfe._file),
+      IoError(dfe), _message(dfe._message), _file(dfe._file),
       _line(dfe._line) {}
 
@@ -319 +319 @@
 
   ///\e 
-  class FileOpenError : public IOError {
+  class FileOpenError : public IoError {
   protected:
     ExceptionMember<std::string> _file;
@@ -327 +327 @@
 
     FileOpenError(const FileOpenError &foe) : 
-      IOError(foe), _file(foe._file) {}
+      IoError(foe), _file(foe._file) {}
 
     ///\e 
@@ -363 +363 @@
   };
 
-  class IOParameterError : public IOError {
+  class IoParameterError : public IoError {
   protected:
     ExceptionMember<std::string> _message;
@@ -371 +371 @@
   public:
 
-    IOParameterError(const IOParameterError &ile) : 
-      IOError(ile), _message(ile._message), _file(ile._file) {}
-
-    ///\e 
-    explicit IOParameterError(const char *the_message)
+    IoParameterError(const IoParameterError &ile) : 
+      IoError(ile), _message(ile._message), _file(ile._file) {}
+
+    ///\e 
+    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) {}
 
@@ -417 +417 @@
       catch (...) {}
       if( _message_holder.valid() ) return _message_holder.get().c_str();
-      return "lemon:IOParameterError";
-    }
-    virtual ~IOParameterError() throw() {}
+      return "lemon:IoParameterError";
+    }
+    virtual ~IoParameterError() throw() {}
   };
 

lemon/lemon_reader.h

@@ -837 +837 @@
         ErrorMessage msg;
         msg << "Multiple read rule for node map: " << name;
-        throw IOParameterError(msg.message());
+        throw IoParameterError(msg.message());
       }      
       readers.insert(
@@ -856 +856 @@
         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::
@@ -906 +906 @@
           ErrorMessage msg;
           msg << "Map not found in file: " << it->first;
-          throw IOParameterError(msg.message());
+          throw IoParameterError(msg.message());
         }
       }
@@ -922 +922 @@
       ErrorMessage msg;
       msg << "NodeSet section not found in file: @nodeset " << name;
-      throw IOParameterError(msg.message());
+      throw IoParameterError(msg.message());
     }
 
@@ -1067 +1067 @@
         ErrorMessage msg;
         msg << "Multiple read rule for edge map: " << name;
-        throw IOParameterError(msg.message());
+        throw IoParameterError(msg.message());
       }
       readers.insert(
@@ -1086 +1086 @@
         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::
@@ -1139 +1139 @@
           ErrorMessage msg;
           msg << "Map not found in file: " << it->first;
-          throw IOParameterError(msg.message());
+          throw IoParameterError(msg.message());
         }
       }
@@ -1157 +1157 @@
       ErrorMessage msg;
       msg << "EdgeSet section not found in file: @edgeset " << name;
-      throw IOParameterError(msg.message());
+      throw IoParameterError(msg.message());
     }
 
@@ -1311 +1311 @@
         ErrorMessage msg;
         msg << "Multiple read rule for edge map: " << name;
-        throw IOParameterError(msg.message());
+        throw IoParameterError(msg.message());
       }
       readers.insert(
@@ -1330 +1330 @@
         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::
@@ -1444 +1444 @@
           ErrorMessage msg;
           msg << "Map not found in file: " << it->first;
-          throw IOParameterError(msg.message());
+          throw IoParameterError(msg.message());
         }
       }
@@ -1462 +1462 @@
       ErrorMessage msg;
       msg << "UEdgeSet section not found in file: @uedgeset " << name;
-      throw IOParameterError(msg.message());
+      throw IoParameterError(msg.message());
     }
 
@@ -1567 +1567 @@
         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)));
@@ -1610 +1610 @@
           ErrorMessage msg;
           msg << "Node not found in file: " << it->first;
-          throw IOParameterError(msg.message());
+          throw IoParameterError(msg.message());
         }
       }
@@ -1619 +1619 @@
       ErrorMessage msg;
       msg << "Nodes section not found in file: @nodes " << name;
-      throw IOParameterError(msg.message());
+      throw IoParameterError(msg.message());
     }
     
@@ -1680 +1680 @@
         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)));
@@ -1723 +1723 @@
           ErrorMessage msg;
           msg << "Edge not found in file: " << it->first;
-          throw IOParameterError(msg.message());
+          throw IoParameterError(msg.message());
         }
       }
@@ -1732 +1732 @@
       ErrorMessage msg;
       msg << "Edges section not found in file: @edges " << name;
-      throw IOParameterError(msg.message());
+      throw IoParameterError(msg.message());
     }
     
@@ -1798 +1798 @@
         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::
@@ -1811 +1811 @@
         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)));
@@ -1867 +1867 @@
           ErrorMessage msg;
           msg << "Edge not found in file: " << it->first;
-          throw IOParameterError(msg.message());
+          throw IoParameterError(msg.message());
         }
       }
@@ -1875 +1875 @@
           ErrorMessage msg;
           msg << "UEdge not found in file: " << it->first;
-          throw IOParameterError(msg.message());
+          throw IoParameterError(msg.message());
         }
       }
@@ -1884 +1884 @@
       ErrorMessage msg;
       msg << "UEdges section not found in file: @uedges " << name;
-      throw IOParameterError(msg.message());
+      throw IoParameterError(msg.message());
     }
     
@@ -1960 +1960 @@
         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::
@@ -2002 +2002 @@
           ErrorMessage msg;
           msg << "Attribute not found in file: " << it->first;
-          throw IOParameterError(msg.message());
+          throw IoParameterError(msg.message());
         }       
       }
@@ -2011 +2011 @@
       ErrorMessage msg;
       msg << "Attribute section not found in file: @attributes " << name;
-      throw IOParameterError(msg.message());
+      throw IoParameterError(msg.message());
     }