From fc68afcf7351e3d9853533a237133ad815c9970a Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sun, 16 Aug 2009 22:05:47 +0000
Subject: [PATCH] Octave: Caught exceptions display the type of the C++
 exception instead of the generic 'c++-side threw an exception' message

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11595 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current                               |  4 ++++
 .../test-suite/octave/exception_order_runme.m | 21 +++++++++----------
 Lib/octave/octtypemaps.swg                    |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index 25c5a80c3..a2cf82f4c 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -1,6 +1,10 @@
 Version 1.3.40 (in progress)
 ============================
 
+2009-08-16: wsfulton
+            [Octave] Caught exceptions display the type of the C++ exception instead of the
+            generic "c++-side threw an exception" message.
+
 2009-08-16: wsfulton
             [Java] When %catches is used, fix so that any classes specified in the "throws"
             attribute of the "throws" typemap are generated into the Java method's throws clause.
diff --git a/Examples/test-suite/octave/exception_order_runme.m b/Examples/test-suite/octave/exception_order_runme.m
index a5914f822..3fb2b9a50 100644
--- a/Examples/test-suite/octave/exception_order_runme.m
+++ b/Examples/test-suite/octave/exception_order_runme.m
@@ -6,40 +6,39 @@ a = A();
 try
   a.foo()
 catch
-  if (!strcmp(raised(),"E1"))
-    error, "bad exception order"
+  if (!strcmp(lasterror.message, "error: C++ side threw an exception of type E1\n"))
+    error("bad exception order")
   endif
 end_try_catch
 
 try
   a.bar()
 catch
-  if (!strcmp(raised(),"E2"))
-    error, "bad exception order"
+  if (!strcmp(lasterror.message, "error: C++ side threw an exception of type E2\n"))
+    error("bad exception order")
   endif
 end_try_catch
 
 try
   a.foobar()
 catch
-  [t,e]=raised();
-  if (!strcmp(e.args(0),"postcatch unknown"))
-    error
+  if (!strcmp(lasterror.message, "error: postcatch unknown (SWIG_RuntimeError)\n"))
+    error("bad exception order")
   endif
 end_try_catch
 
 try
   a.barfoo(1)
 catch
-  if (!strcmp(raised(),"E1"))
-    error, "bad exception order"
+  if (!strcmp(lasterror.message, "error: C++ side threw an exception of type E1\n"))
+    error("bad exception order")
   endif
 end_try_catch
 
 try
   a.barfoo(2)
 catch
-  if (!strcmp(raised(),"E2"))
-    error, "bad exception order"
+  if (!strcmp(lasterror.message, "error: C++ side threw an exception of type E2 *\n"))
+    error("bad exception order")
   endif
 end_try_catch
diff --git a/Lib/octave/octtypemaps.swg b/Lib/octave/octtypemaps.swg
index 7934f90bd..26a52197f 100644
--- a/Lib/octave/octtypemaps.swg
+++ b/Lib/octave/octtypemaps.swg
@@ -32,7 +32,7 @@
 #define SWIG_SetConstant(name, obj)     SWIG_Octave_SetConstant(module_ns,name,obj) 
 
 // raise
-#define SWIG_Octave_Raise(obj, type, desc) error("c++-side threw an exception")
+#define SWIG_Octave_Raise(OBJ, TYPE, DESC) error("C++ side threw an exception of type " TYPE)
 #define SWIG_Raise(obj, type, desc)     SWIG_Octave_Raise(obj, type, desc)
 
 // Include the unified typemap library