Mercurial > octave-nkf
view libinterp/corefcn/Cell.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 | 4197fc428c7d |
children |
line wrap: on
line source
/* Copyright (C) 1999-2015 John W. Eaton Copyright (C) 2009-2010 VZLU Prague 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/>. */ #if !defined (octave_Cell_h) #define octave_Cell_h 1 #include <string> #include "Array.h" #include "str-vec.h" #include "ov.h" class octave_value_list; class OCTINTERP_API Cell : public Array<octave_value> { public: Cell (void) : Array<octave_value> (dim_vector (0, 0)) { } Cell (const octave_value& val) : Array<octave_value> (dim_vector (1, 1), val) { } Cell (const octave_value_list& ovl); Cell (octave_idx_type n, octave_idx_type m, const octave_value& val = Matrix ()) : Array<octave_value> (dim_vector (n, m), val) { } Cell (const dim_vector& dv, const octave_value& val = Matrix ()) : Array<octave_value> (dv, val) { } Cell (const Array<octave_value>& c) : Array<octave_value> (c) { } Cell (const Array<octave_value>& c, octave_idx_type nr, octave_idx_type nc) : Array<octave_value> (c, dim_vector (nr, nc)) { } Cell (const string_vector& sv, bool trim = false); Cell (const std::list<std::string>& lst); Cell (const Array<std::string>& sa); Cell (const dim_vector& dv, const string_vector& sv, bool trim = false); Cell (const Cell& c) : Array<octave_value> (c) { } bool is_cellstr (void) const; Array<std::string> cellstr_value (void) const; using Array<octave_value>::index; Cell index (const octave_value_list& idx, bool resize_ok = false) const; using Array<octave_value>::delete_elements; void delete_elements (const octave_value_list& idx); using Array<octave_value>::assign; void assign (const octave_value_list& idx, const Cell& rhs, const octave_value& fill_val = Matrix ()); Cell reshape (const dim_vector& new_dims) const { return Array<octave_value>::reshape (new_dims); } octave_idx_type nnz (void) const; Cell column (octave_idx_type i) const; // FIXME boolMatrix all (int /* dim */ = 0) const { return boolMatrix (); } // FIXME boolMatrix any (int /* dim */ = 0) const { return boolMatrix (); } Cell concat (const Cell& rb, const Array<octave_idx_type>& ra_idx); Cell& insert (const Cell& a, octave_idx_type r, octave_idx_type c); Cell& insert (const Cell& a, const Array<octave_idx_type>& ra_idx); // FIXME bool any_element_is_nan (void) const { return false; } bool is_true (void) const { return false; } octave_value resize_fill_value (void) const { static Matrix rfv; return rfv; } Cell diag (octave_idx_type k = 0) const; Cell diag (octave_idx_type m, octave_idx_type n) const; Cell xisalnum (void) const { return map (&octave_value::xisalnum); } Cell xisalpha (void) const { return map (&octave_value::xisalpha); } Cell xisascii (void) const { return map (&octave_value::xisascii); } Cell xiscntrl (void) const { return map (&octave_value::xiscntrl); } Cell xisdigit (void) const { return map (&octave_value::xisdigit); } Cell xisgraph (void) const { return map (&octave_value::xisgraph); } Cell xislower (void) const { return map (&octave_value::xislower); } Cell xisprint (void) const { return map (&octave_value::xisprint); } Cell xispunct (void) const { return map (&octave_value::xispunct); } Cell xisspace (void) const { return map (&octave_value::xisspace); } Cell xisupper (void) const { return map (&octave_value::xisupper); } Cell xisxdigit (void) const { return map (&octave_value::xisxdigit); } Cell xtoascii (void) const { return map (&octave_value::xtoascii); } Cell xtolower (void) const { return map (&octave_value::xtolower); } Cell xtoupper (void) const { return map (&octave_value::xtoupper); } private: typedef octave_value (octave_value::*ctype_mapper) (void) const; Cell map (ctype_mapper) const; }; template<> inline Cell octave_value_extract<Cell> (const octave_value& v) { return v.cell_value (); } #endif