Ticket #580: implement-error-clone.patch

generate-exceptions

@@ -139 +139 @@
      */
     const char * get_error_string() const;
 
+    /** Allocate and return a copy of this object. */
+    Xapian::Error * clone() const;
+
     /// Return a string describing this object.
     std::string get_description() const;
 };
@@ -153 +156 @@
 
 // DOXYGEN gets confused by this header-with-code.
 #ifndef DOXYGEN
+
+// You must define XAPIAN_DISPATCH_ERROR(CLASS) before including this file.
+
 EOF
 
 for (@baseclasses) {
@@ -183 +189 @@
     my ($class, $parent, $comment) = split /\t/, $_, 3;
     my $code = sprintf('\%03o', $classcode{$class});
 
-    print DISPATCH "case '$code': throw Xapian::$class(msg, context, error_string);\n";
+    print DISPATCH "case '$code': XAPIAN_DISPATCH_ERROR($class)\n";
 
     print HDR <<EOF;
 

net/serialise.cc

@@ -109 +109 @@
         }
 
         switch (type) {
+#define XAPIAN_DISPATCH_ERROR(CLASS) throw Xapian::CLASS(msg, context, error_string);
 #include "xapian/errordispatch.h"
         }
     }

api/error.cc

@@ -32 +32 @@
 #include <cstdio> // For sprintf().
 #include <cstring> // For strerror().
 
+#include "omassert.h"
 #include "str.h"
 
 using namespace std;
@@ -103 +104 @@
 #endif
 }
 
+Xapian::Error *
+Xapian::Error::clone() const
+{
+    switch (*type) {
+#define XAPIAN_DISPATCH_ERROR(CLASS) \
+        return new Xapian::CLASS(static_cast<const Xapian::CLASS &>(*this));
+#include "xapian/errordispatch.h"
+    }
+    Assert(false);
+    return NULL; // FIXME: Shouldn't get here!
+}
+
 string
 Xapian::Error::get_description() const
 {