Mercurial > octave-nkf
view libinterp/corefcn/mex.h @ 20569:b70cc4bd8109
begin removal of global error_state variable
* gripes.h, gripes.cc (gripe_library_execution_error): Delete.
* error.cc (warning_state): Delete unused variable.
(reset_error_handler): Don't set warning_state or error_state.
(debug_or_throw_exception): New static function.
(verror): Don't check error_state.
(vmessage): Call debug_or_throw_exception instead of setting
error_state.
(error_1, error_2): Combine into single function, error_1 that prints
error message and ultimately calls debug_or_throw_exception.
(verror, verror_with_cfn, verror_with_id_cfn): Call error_1. Don't
check or set warning_state.
(error): Don't check error_state.
(Flasterror, Flasterr): Adapt to not using error_state.
(interpreter_try): Don't unwind_protect error_state.
* NEWS: Update.
* doc/interpreter/external.txi: Explain octave_execution_exception
instead of error_state for matrix addition example.
* jit-typeinfo.cc (octave_jit_gripe_nan_to_logical_conversion,
octave_jit_ginvalid_index, octave_jit_gindex_range,
octave_jit_paren_scalar, octave_jit_paren_scalar_subsasgn):
Don't catch octave_execution_exception.
* cellfun.cc (Fcellfun): Use exceptions instead of error_state.
* ls-mat-ascii.cc (save_mat_ascii_data): Likewise.
* mex.cc (mexCallMATLAB, mexEvalString): Likewise.
* variables.cc (safe_symbol_lookup): Likewise.
* svd.cc (Fsvd): Eliminate use of error_state.
* __magick_read__.cc (read_file, write_file): Likewise.
* variables.cc (generate_struct_completions): Eliminate use of
obsolete warning_state variable.
* ov-builtin.cc (octave_builtin::do_multi_index_op): Don't catch
octave_execution_exception and call gripe_library_execution_error.
* ov-class.cc (octave_class::reconstruct_exemplar): Eliminate use of
error_state. Catch possible octave_execution_exception in
do_multi_index_op.
* ov-mex-fcn.cc (octave_mex_function::do_multi_index_op): Eliminate
use of error_state. Catch possible octave_execution_exception in
call_mex.
* ov-fcn-handle.cc (octave_fcn_binder::maybe_binder): Eliminate use of
error_state.
* ov-oncleanup.cc (octave_oncleanup::~octave_oncleanup): Eliminate use
of error_state. Propagate possible octave_execution_exception from
do_multi_index_op.
* ov.cc (octave_value::assign, do_binary_op, do_unary_op,
octave_value::do_non_const_unary_op): Don't catch
octave_execution_exception here.
* oct-parse.in.yy (octave_base_parser::finish_colon_expression,
octave_base_parser::finish_array_list): Eliminate use of warning_state
and error_state.
(Feval, Fevalin): Use exceptions instead of error_state.
* pt-eval.cc, pt-eval.h (tree_evaluator::unwind_protect_exception):
New static variable.
* (tree_evaluator::visit_statement): Don't catch
octave_execution_exception here.
(tree_evaluator::visit_try_catch_command,
tree_evaluator::do_unwind_protect_cleanup): Eliminate use of error_state.
(tree_evaluator::visit_unwind_protect_command): Use
unwind_protect_exception to track whether an exception has occurred in
the try block.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 01 Oct 2015 16:18:19 -0400 |
parents | 3aea4200da40 |
children |
line wrap: on
line source
/* Copyright (C) 2001-2015 Paul Kienzle This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ /* This code was originally distributed as part of Octave Forge under the following terms: Author: Paul Kienzle I grant this code to the public domain. 2001-03-22 THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* mex.h is for use in C-programs only; do NOT include it in mex.cc */ #if ! defined (MEX_H) #define MEX_H #define HAVE_OCTAVE typedef void mxArray; #if ! defined (__cplusplus) && ! defined (bool) typedef int bool; #endif /* -V4 stuff */ #if defined (V4) #define Matrix mxArray #define REAL mxREAL #endif #define mxMAXNAME 64 #include <stdint.h> #include "mexproto.h" #if defined (__cplusplus) extern "C" { #endif #if defined (V4) void mexFunction (int nlhs, mxArray* plhs[], int nrhs, mxArray *prhs[]); #else void mexFunction (int nlhs, mxArray* plhs[], int nrhs, const mxArray *prhs[]); #endif /* V4 floating point routines renamed in V5. */ #define mexIsNaN mxIsNaN #define mexIsFinite mxIsFinite #define mexIsInf mxIsInf #define mexGetEps mxGetEps #define mexGetInf mxGetInf #define mexGetNaN mxGetNan #define mexGetGlobal(nm) mexGetArray (nm, "global") #define mexGetMatrix(nm) mexGetArray (nm, "caller") #define mexGetMatrixPtr(nm) mexGetArrayPtr (nm, "caller") #define mexGetArray(nm, space) mexGetVariable (space, nm) #define mexGetArrayPtr(nm, space) mexGetVariablePtr (space, nm) #define mexPutMatrix(ptr) mexPutVariable ("caller", "", ptr) #define mexPutArray(ptr, space) mexPutVariable (space, "", ptr) #define mxCreateFull mxCreateDoubleMatrix #define mxCreateScalarDouble mxCreateDoubleScalar #define mxFreeMatrix mxDestroyArray #define mxIsString mxIsChar /* Apparently these are also defined. */ #ifndef UINT64_T #define UINT64_T uint64_t #endif #ifndef uint64_T #define uint64_T uint64_t #endif #ifndef INT64_T #define INT64_T int64_t #endif #ifndef int64_T #define int64_T int64_t #endif #ifndef UINT32_T #define UINT32_T uint32_t #endif #ifndef uint32_T #define uint32_T uint32_t #endif #ifndef INT32_T #define INT32_T int32_t #endif #ifndef int32_T #define int32_T int32_t #endif #ifndef UINT16_T #define UINT16_T uint16_t #endif #ifndef uint16_T #define uint16_T uint16_t #endif #ifndef INT16_T #define INT16_T int16_t #endif #ifndef int16_T #define int16_T int16_t #endif #ifndef UINT8_T #define UINT8_T uint8_t #endif #ifndef uint8_T #define uint8_T uint8_t #endif #ifndef INT8_T #define INT8_T int8_t #endif #ifndef int8_T #define int8_T int8_t #endif #if defined (__cplusplus) } #endif #endif