Mercurial > hg > octave-nkf

diff src/ov-builtin.cc @ 7487:1e01db14700b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
catch octave_execution_exception for built-in and mex functions
author John W. Eaton <jwe@octave.org>
date Fri, 15 Feb 2008 19:49:14 -0500
parents a1dbe9d80eee
children 3100283874d7
line wrap: on
line diff
--- a/src/ov-builtin.cc
+++ b/src/ov-builtin.cc
@@ -101,7 +101,15 @@
 
       unwind_protect::add (octave_call_stack::unwind_pop, 0);
 
-      retval = (*f) (args, nargout);
+      try
+	{
+	  retval = (*f) (args, nargout);
+	}
+      catch (octave_execution_exception)
+	{
+	  octave_exception_state = octave_no_exception;
+	  error ("caught execution error in library function");
+	}
 
       unwind_protect::run_frame ("builtin_func_eval");
     }