Changeset 7:f227a74db59d in glemon for xml.h

Timestamp:

10/10/08 14:36:20 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Tags:

tip

Message:

Update to compile with the latest LEMON (version 1.0 or [5e12d7734036])

File:

• xml.h (modified) (10 diffs)

xml.h

@@ -26 +26 @@
 #include <map>
 #include <lemon/error.h>
+#include <lemon/assert.h>
 #include <lemon/dim2.h>
 
@@ -75 +76 @@
         if(level>=0) indent(level);
         else level=0;
-      else throw LogicError();  
+      else LEMON_ASSERT(true, "Invalid indentation.");  
     }
   
@@ -160 +161 @@
     void skipWhiteSpaces()
     {
-      if(write()) throw LogicError();
+      if(write()) LEMON_ASSERT(true, "Can't skip whitespaces in write mode.");
       {
         char c;
@@ -181 +182 @@
     void useTag(const std::string &_tag) {
       if(nextTag()==_tag) useTag();
-      else throw DataFormatError("",line_number,"Unexpected token name");
+      else throw FormatError("Unexpected token name","",line_number);
     }
   public:
@@ -190 +191 @@
     const std::string &nextTag() 
     {
-      if(write()) throw LogicError();
+      if(write()) LEMON_ASSERT(true,"Don't use nextTag() in write mode");
       else if(next_tag.empty()) {
         char c;
         skipWhiteSpaces();
         if(!is.get(c) || c!='<')
-          throw DataFormatError("",line_number,"Bad format");
+          throw FormatError("Bad format","",line_number);
         next_tag.clear();
         while (is.get(c) && c!='>') next_tag.push_back(c);
         if(c!='>')
-          throw DataFormatError("",line_number,"Bad format");
+          throw FormatError("Bad format","",line_number);
       }
       return next_tag;
@@ -230 +231 @@
         skipWhiteSpaces();
         if(!(is >> const_cast<int &>(v))) 
-          throw DataFormatError("",line_number,"Not an 'int'");
+          throw FormatError("Not an 'int'","",line_number);
       }
       return *this;
@@ -240 +241 @@
         skipWhiteSpaces();
         if(!(is >> const_cast<double &>(v))) 
-          throw DataFormatError("",line_number,"Not an 'double'");
+          throw FormatError("Not an 'double'","",line_number);
       }
       return *this;
@@ -272 +273 @@
           if(c=='\\')
             if(!is.get(c))
-              throw DataFormatError("",line_number,"Bad string");
+              throw FormatError("Bad string","",line_number);
             else switch(c) {
             case 'n':
@@ -286 +287 @@
           }
         if(c!='<')
-          throw DataFormatError("",line_number,"Unexpected eof");
+          throw FormatError("Unexpected eof","",line_number);
         is.unget();
       }
@@ -426 +427 @@
   ///
   template<class T>
-  void xml(XmlIo &x,lemon::dim2::BoundingBox<T> &v)
+  void xml(XmlIo &x,lemon::dim2::Box<T> &v)
   {
     if(x.write()) {