Mercurial > octave

diff libinterp/corefcn/gripes.h @ 20756:200ae1d650b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate octave_execution_exception objects through try/catch blocks * gripes.h, gripes.cc (gripe_user_supplied_eval, gripe_wrong_type_arg): New overloaded functions that accept octave_execution_exception objects. * error.h, error.cc (error, verror, error_1, usage_1, debug_or_throw_exception): New overloaded functions that accept * octave_execution_exception objects. * __qp__.cc, cellfun.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, file-io.cc, graphics.cc, graphics.in.h, input.cc, load-path.cc, ls-mat-ascii.cc, lsode.cc, mex.cc, oct-handle.h, oct-map.cc, oct-stream.cc, quad.cc, rand.cc, toplev.cc, utils.cc, variables.cc, __eigs__.cc, ov-base.cc, ov-class.cc, ov-fcn-handle.cc, ov-oncleanup.cc, ov.cc, octave.cc, oct-parse.in.yy: Propagate octave_execution_exception objects through try/catch blocks.
author John W. Eaton <jwe@octave.org>
date Wed, 25 Nov 2015 15:27:48 -0500
parents 68e3a747ca02
children b6f2909e7f94
line wrap: on
line diff
--- a/libinterp/corefcn/gripes.h	Wed Nov 25 11:32:28 2015 -0800
+++ b/libinterp/corefcn/gripes.h	Wed Nov 25 15:27:48 2015 -0500
@@ -28,6 +28,7 @@
 #include "lo-array-gripes.h"
 
 class octave_value;
+class octave_execution_exception;
 
 extern OCTINTERP_API void
 gripe_not_supported (const char *);
@@ -58,6 +59,10 @@
 gripe_user_supplied_eval (const char *name);
 
 extern OCTINTERP_API void
+gripe_user_supplied_eval (const octave_execution_exception& e,
+                          const char *name);
+
+extern OCTINTERP_API void
 gripe_user_returned_invalid (const char *name);
 
 extern OCTINTERP_API void
@@ -83,27 +88,59 @@
                       bool is_error = true);
 
 extern OCTINTERP_API void
+gripe_wrong_type_arg (const octave_execution_exception& e,
+                      const char *name, const char *s,
+                      bool is_error = true);
+
+extern OCTINTERP_API void
 gripe_wrong_type_arg (const char *name, const std::string& s,
                       bool is_error = true);
 
 extern OCTINTERP_API void
+gripe_wrong_type_arg (const octave_execution_exception& e,
+                      const char *name, const std::string& s,
+                      bool is_error = true);
+
+extern OCTINTERP_API void
 gripe_wrong_type_arg (const char *name, const octave_value& tc,
                       bool is_error = true);
 
 extern OCTINTERP_API void
+gripe_wrong_type_arg (const octave_execution_exception& e,
+                      const char *name, const octave_value& tc,
+                      bool is_error = true);
+
+extern OCTINTERP_API void
 gripe_wrong_type_arg (const std::string& name, const octave_value& tc,
                       bool is_error = true);
 
 extern OCTINTERP_API void
+gripe_wrong_type_arg (const octave_execution_exception& e,
+                      const std::string& name, const octave_value& tc,
+                      bool is_error = true);
+
+extern OCTINTERP_API void
 gripe_wrong_type_arg (const char *s, bool is_error = true);
 
 extern OCTINTERP_API void
+gripe_wrong_type_arg (const octave_execution_exception& e,
+                      const char *s, bool is_error = true);
+
+extern OCTINTERP_API void
 gripe_wrong_type_arg (const std::string& s, bool is_error = true);
 
 extern OCTINTERP_API void
+gripe_wrong_type_arg (const octave_execution_exception& e,
+                      const std::string& s, bool is_error = true);
+
+extern OCTINTERP_API void
 gripe_wrong_type_arg (const octave_value& tc, bool is_error = true);
 
 extern OCTINTERP_API void
+gripe_wrong_type_arg (const octave_execution_exception& e,
+                      const octave_value& tc, bool is_error = true);
+
+extern OCTINTERP_API void
 gripe_wrong_type_arg_for_unary_op (const octave_value& op);
 
 extern OCTINTERP_API void