1.1 --- a/lemon/error.h	Tue Jul 18 15:14:56 2006 +0000
     1.2 +++ b/lemon/error.h	Tue Jul 18 15:57:55 2006 +0000
     1.3 @@ -235,15 +235,15 @@
     1.4    };
     1.5  
     1.6    ///\e 
     1.7 -  class IOError : public RuntimeError {
     1.8 +  class IoError : public RuntimeError {
     1.9    public:
    1.10      virtual const char* what() const throw() {
    1.11 -      return "lemon::IOError";
    1.12 +      return "lemon::IoError";
    1.13      }
    1.14    };
    1.15  
    1.16    ///\e 
    1.17 -  class DataFormatError : public IOError {
    1.18 +  class DataFormatError : public IoError {
    1.19    protected:
    1.20      ExceptionMember<std::string> _message;
    1.21      ExceptionMember<std::string> _file;
    1.22 @@ -253,7 +253,7 @@
    1.23    public:
    1.24  
    1.25      DataFormatError(const DataFormatError &dfe) : 
    1.26 -      IOError(dfe), _message(dfe._message), _file(dfe._file),
    1.27 +      IoError(dfe), _message(dfe._message), _file(dfe._file),
    1.28        _line(dfe._line) {}
    1.29  
    1.30      ///\e 
    1.31 @@ -318,7 +318,7 @@
    1.32    };
    1.33  
    1.34    ///\e 
    1.35 -  class FileOpenError : public IOError {
    1.36 +  class FileOpenError : public IoError {
    1.37    protected:
    1.38      ExceptionMember<std::string> _file;
    1.39  
    1.40 @@ -326,7 +326,7 @@
    1.41    public:
    1.42  
    1.43      FileOpenError(const FileOpenError &foe) : 
    1.44 -      IOError(foe), _file(foe._file) {}
    1.45 +      IoError(foe), _file(foe._file) {}
    1.46  
    1.47      ///\e 
    1.48      explicit FileOpenError(const std::string& file)
    1.49 @@ -362,7 +362,7 @@
    1.50      virtual ~FileOpenError() throw() {}
    1.51    };
    1.52  
    1.53 -  class IOParameterError : public IOError {
    1.54 +  class IoParameterError : public IoError {
    1.55    protected:
    1.56      ExceptionMember<std::string> _message;
    1.57      ExceptionMember<std::string> _file;
    1.58 @@ -370,15 +370,15 @@
    1.59      mutable ExceptionMember<std::string> _message_holder;
    1.60    public:
    1.61  
    1.62 -    IOParameterError(const IOParameterError &ile) : 
    1.63 -      IOError(ile), _message(ile._message), _file(ile._file) {}
    1.64 +    IoParameterError(const IoParameterError &ile) : 
    1.65 +      IoError(ile), _message(ile._message), _file(ile._file) {}
    1.66  
    1.67      ///\e 
    1.68 -    explicit IOParameterError(const char *the_message)
    1.69 +    explicit IoParameterError(const char *the_message)
    1.70        : _message(the_message) {}
    1.71  
    1.72      ///\e 
    1.73 -    IOParameterError(const char *file_name, const char *the_message)
    1.74 +    IoParameterError(const char *file_name, const char *the_message)
    1.75        : _message(the_message), _file(file_name) {}
    1.76  
    1.77       ///\e 
    1.78 @@ -416,9 +416,9 @@
    1.79        }
    1.80        catch (...) {}
    1.81        if( _message_holder.valid() ) return _message_holder.get().c_str();
    1.82 -      return "lemon:IOParameterError";
    1.83 +      return "lemon:IoParameterError";
    1.84      }
    1.85 -    virtual ~IOParameterError() throw() {}
    1.86 +    virtual ~IoParameterError() throw() {}
    1.87    };
    1.88  
    1.89  

     2.1 --- a/lemon/lemon_reader.h	Tue Jul 18 15:14:56 2006 +0000
     2.2 +++ b/lemon/lemon_reader.h	Tue Jul 18 15:57:55 2006 +0000
     2.3 @@ -836,7 +836,7 @@
     2.4        if (readers.find(name) != readers.end()) {
     2.5  	ErrorMessage msg;
     2.6  	msg << "Multiple read rule for node map: " << name;
     2.7 -	throw IOParameterError(msg.message());
     2.8 +	throw IoParameterError(msg.message());
     2.9        }      
    2.10        readers.insert(
    2.11          make_pair(name, new _reader_bits::
    2.12 @@ -855,7 +855,7 @@
    2.13        if (readers.find(name) != readers.end()) {
    2.14  	ErrorMessage msg;
    2.15  	msg << "Multiple read rule for node map: " << name;
    2.16 -	throw IOParameterError(msg.message());
    2.17 +	throw IoParameterError(msg.message());
    2.18        }
    2.19        readers.insert(make_pair(name, new _reader_bits::
    2.20  			       SkipReader<Node, Reader>(reader)));
    2.21 @@ -905,7 +905,7 @@
    2.22  	if (!it->second->touched()) {
    2.23  	  ErrorMessage msg;
    2.24  	  msg << "Map not found in file: " << it->first;
    2.25 -	  throw IOParameterError(msg.message());
    2.26 +	  throw IoParameterError(msg.message());
    2.27  	}
    2.28        }
    2.29        while (getline(is, line)) {	
    2.30 @@ -921,7 +921,7 @@
    2.31        if (readers.empty()) return;
    2.32        ErrorMessage msg;
    2.33        msg << "NodeSet section not found in file: @nodeset " << name;
    2.34 -      throw IOParameterError(msg.message());
    2.35 +      throw IoParameterError(msg.message());
    2.36      }
    2.37  
    2.38    public:
    2.39 @@ -1066,7 +1066,7 @@
    2.40        if (readers.find(name) != readers.end()) {
    2.41  	ErrorMessage msg;
    2.42  	msg << "Multiple read rule for edge map: " << name;
    2.43 -	throw IOParameterError(msg.message());
    2.44 +	throw IoParameterError(msg.message());
    2.45        }
    2.46        readers.insert(
    2.47  	make_pair(name, new _reader_bits::
    2.48 @@ -1085,7 +1085,7 @@
    2.49        if (readers.find(name) != readers.end()) {
    2.50  	ErrorMessage msg;
    2.51  	msg << "Multiple read rule for edge map: " << name;
    2.52 -	throw IOParameterError(msg.message());
    2.53 +	throw IoParameterError(msg.message());
    2.54        }
    2.55        readers.insert(make_pair(name, new _reader_bits::
    2.56  			       SkipReader<Edge, Reader>(reader)));
    2.57 @@ -1138,7 +1138,7 @@
    2.58  	if (!it->second->touched()) {
    2.59  	  ErrorMessage msg;
    2.60  	  msg << "Map not found in file: " << it->first;
    2.61 -	  throw IOParameterError(msg.message());
    2.62 +	  throw IoParameterError(msg.message());
    2.63  	}
    2.64        }
    2.65        while (getline(is, line)) {	
    2.66 @@ -1156,7 +1156,7 @@
    2.67        if (readers.empty()) return;
    2.68        ErrorMessage msg;
    2.69        msg << "EdgeSet section not found in file: @edgeset " << name;
    2.70 -      throw IOParameterError(msg.message());
    2.71 +      throw IoParameterError(msg.message());
    2.72      }
    2.73  
    2.74    public:
    2.75 @@ -1310,7 +1310,7 @@
    2.76        if (readers.find(name) != readers.end()) {
    2.77  	ErrorMessage msg;
    2.78  	msg << "Multiple read rule for edge map: " << name;
    2.79 -	throw IOParameterError(msg.message());
    2.80 +	throw IoParameterError(msg.message());
    2.81        }
    2.82        readers.insert(
    2.83  	make_pair(name, new _reader_bits::
    2.84 @@ -1329,7 +1329,7 @@
    2.85        if (readers.find(name) != readers.end()) {
    2.86  	ErrorMessage msg;
    2.87  	msg << "Multiple read rule for node map: " << name;
    2.88 -	throw IOParameterError(msg.message());
    2.89 +	throw IoParameterError(msg.message());
    2.90        }
    2.91        readers.insert(make_pair(name, new _reader_bits::
    2.92  			       SkipReader<UEdge, Reader>(reader)));
    2.93 @@ -1443,7 +1443,7 @@
    2.94  	if (!it->second->touched()) {
    2.95  	  ErrorMessage msg;
    2.96  	  msg << "Map not found in file: " << it->first;
    2.97 -	  throw IOParameterError(msg.message());
    2.98 +	  throw IoParameterError(msg.message());
    2.99  	}
   2.100        }
   2.101        while (getline(is, line)) {	
   2.102 @@ -1461,7 +1461,7 @@
   2.103        if (readers.empty()) return;
   2.104        ErrorMessage msg;
   2.105        msg << "UEdgeSet section not found in file: @uedgeset " << name;
   2.106 -      throw IOParameterError(msg.message());
   2.107 +      throw IoParameterError(msg.message());
   2.108      }
   2.109  
   2.110    public:
   2.111 @@ -1566,7 +1566,7 @@
   2.112        if (readers.find(name) != readers.end()) {
   2.113  	ErrorMessage msg;
   2.114  	msg << "Multiple read rule for node: " << name;
   2.115 -	throw IOParameterError(msg.message());
   2.116 +	throw IoParameterError(msg.message());
   2.117        }
   2.118        readers.insert(make_pair(name, _reader_bits::ItemStore<Node>(item)));
   2.119      }
   2.120 @@ -1609,7 +1609,7 @@
   2.121  	if (!it->second.touched()) {
   2.122  	  ErrorMessage msg;
   2.123  	  msg << "Node not found in file: " << it->first;
   2.124 -	  throw IOParameterError(msg.message());
   2.125 +	  throw IoParameterError(msg.message());
   2.126  	}
   2.127        }
   2.128      }
   2.129 @@ -1618,7 +1618,7 @@
   2.130        if (readers.empty()) return;
   2.131        ErrorMessage msg;
   2.132        msg << "Nodes section not found in file: @nodes " << name;
   2.133 -      throw IOParameterError(msg.message());
   2.134 +      throw IoParameterError(msg.message());
   2.135      }
   2.136      
   2.137    private:
   2.138 @@ -1679,7 +1679,7 @@
   2.139        if (readers.find(name) != readers.end()) {
   2.140  	ErrorMessage msg;
   2.141  	msg << "Multiple read rule for edge: " << name;
   2.142 -	throw IOParameterError(msg.message());
   2.143 +	throw IoParameterError(msg.message());
   2.144        }
   2.145        readers.insert(make_pair(name, _reader_bits::ItemStore<Edge>(item)));
   2.146      }
   2.147 @@ -1722,7 +1722,7 @@
   2.148  	if (!it->second.touched()) {
   2.149  	  ErrorMessage msg;
   2.150  	  msg << "Edge not found in file: " << it->first;
   2.151 -	  throw IOParameterError(msg.message());
   2.152 +	  throw IoParameterError(msg.message());
   2.153  	}
   2.154        }
   2.155      }
   2.156 @@ -1731,7 +1731,7 @@
   2.157        if (readers.empty()) return;
   2.158        ErrorMessage msg;
   2.159        msg << "Edges section not found in file: @edges " << name;
   2.160 -      throw IOParameterError(msg.message());
   2.161 +      throw IoParameterError(msg.message());
   2.162      }
   2.163      
   2.164    private:
   2.165 @@ -1797,7 +1797,7 @@
   2.166        if (uEdgeReaders.find(name) != uEdgeReaders.end()) {
   2.167  	ErrorMessage msg;
   2.168  	msg << "Multiple read rule for undirected edge: " << name;
   2.169 -	throw IOParameterError(msg.message());
   2.170 +	throw IoParameterError(msg.message());
   2.171        }
   2.172        uEdgeReaders.insert(make_pair(name, _reader_bits::
   2.173  					ItemStore<UEdge>(item)));
   2.174 @@ -1810,7 +1810,7 @@
   2.175        if (edgeReaders.find(name) != edgeReaders.end()) {
   2.176  	ErrorMessage msg;
   2.177  	msg << "Multiple read rule for edge: " << name;
   2.178 -	throw IOParameterError(msg.message());
   2.179 +	throw IoParameterError(msg.message());
   2.180        }
   2.181        edgeReaders.insert(make_pair(name, _reader_bits::ItemStore<Edge>(item)));
   2.182      }
   2.183 @@ -1866,7 +1866,7 @@
   2.184  	if (!it->second.touched()) {
   2.185  	  ErrorMessage msg;
   2.186  	  msg << "Edge not found in file: " << it->first;
   2.187 -	  throw IOParameterError(msg.message());
   2.188 +	  throw IoParameterError(msg.message());
   2.189  	}
   2.190        }
   2.191        for (typename UEdgeReaders::iterator it = uEdgeReaders.begin();
   2.192 @@ -1874,7 +1874,7 @@
   2.193  	if (!it->second.touched()) {
   2.194  	  ErrorMessage msg;
   2.195  	  msg << "UEdge not found in file: " << it->first;
   2.196 -	  throw IOParameterError(msg.message());
   2.197 +	  throw IoParameterError(msg.message());
   2.198  	}
   2.199        }
   2.200      }
   2.201 @@ -1883,7 +1883,7 @@
   2.202        if (edgeReaders.empty() && uEdgeReaders.empty()) return;
   2.203        ErrorMessage msg;
   2.204        msg << "UEdges section not found in file: @uedges " << name;
   2.205 -      throw IOParameterError(msg.message());
   2.206 +      throw IoParameterError(msg.message());
   2.207      }
   2.208      
   2.209    private:
   2.210 @@ -1959,7 +1959,7 @@
   2.211        if (readers.find(name) != readers.end()) {
   2.212  	ErrorMessage msg;
   2.213  	msg << "Multiple read rule for attribute: " << name;
   2.214 -	throw IOParameterError(msg.message());
   2.215 +	throw IoParameterError(msg.message());
   2.216        }
   2.217        readers.insert(make_pair(name, new _reader_bits::
   2.218  			       ValueReader<Value, Reader>(value, reader)));
   2.219 @@ -2001,7 +2001,7 @@
   2.220  	if (!it->second->touched()) {
   2.221  	  ErrorMessage msg;
   2.222  	  msg << "Attribute not found in file: " << it->first;
   2.223 -	  throw IOParameterError(msg.message());
   2.224 +	  throw IoParameterError(msg.message());
   2.225  	}	
   2.226        }
   2.227      }    
   2.228 @@ -2010,7 +2010,7 @@
   2.229        if (readers.empty()) return;
   2.230        ErrorMessage msg;
   2.231        msg << "Attribute section not found in file: @attributes " << name;
   2.232 -      throw IOParameterError(msg.message());
   2.233 +      throw IoParameterError(msg.message());
   2.234      }
   2.235  
   2.236    private: