Mercurial > octave-nkf
view libinterp/corefcn/hook-fcn.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) 2013-2015 John W. Eaton 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_hook_fcn_h) #define octave_hook_fcn_h 1 #include <string> #include "oct-obj.h" #include "ov.h" #include "ov-fcn-handle.h" #include "parse.h" #include "variables.h" class base_hook_function { public: friend class hook_function; base_hook_function (void) : count (1) { } base_hook_function (const base_hook_function&) : count (1) { } virtual ~base_hook_function (void) { } virtual std::string id (void) { return std::string (); } virtual bool is_valid (void) { return false; } virtual void eval (const octave_value_list&) { } protected: size_t count; }; class hook_function { public: hook_function (void) { static base_hook_function nil_rep; rep = &nil_rep; rep->count++; } hook_function (const octave_value& f, const octave_value& d = octave_value ()); ~hook_function (void) { if (--rep->count == 0) delete rep; } hook_function (const hook_function& hf) : rep (hf.rep) { rep->count++; } hook_function& operator = (const hook_function& hf) { if (rep != hf.rep) { if (--rep->count == 0) delete rep; rep = hf.rep; rep->count++; } return *this; } std::string id (void) { return rep->id (); } bool is_valid (void) { return rep->is_valid (); } void eval (const octave_value_list& initial_args) { rep->eval (initial_args); } private: base_hook_function *rep; }; class named_hook_function : public base_hook_function { public: named_hook_function (const std::string& n, const octave_value& d) : name (n), data (d) { } void eval (const octave_value_list& initial_args) { octave_value_list args = initial_args; if (data.is_defined ()) args.append (data); feval (name, args, 0); } std::string id (void) { return name; } bool is_valid (void) { return is_valid_function (name); } private: std::string name; octave_value data; }; class fcn_handle_hook_function : public base_hook_function { public: fcn_handle_hook_function (const octave_value& fh_arg, const octave_value& d) : ident (), valid (false), fcn_handle (fh_arg), data (d) { octave_fcn_handle *fh = fcn_handle.fcn_handle_value (true); if (fh) { valid = true; std::ostringstream buf; buf << fh; ident = fh->fcn_name () + ":" + buf.str (); } } void eval (const octave_value_list& initial_args) { octave_value_list args = initial_args; if (data.is_defined ()) args.append (data); fcn_handle.do_multi_index_op (0, args); } std::string id (void) { return ident; } bool is_valid (void) { return valid; } private: std::string ident; bool valid; octave_value fcn_handle; octave_value data; }; class hook_function_list { public: typedef std::map<std::string, hook_function> map_type; typedef map_type::iterator iterator; typedef map_type::const_iterator const_iterator; hook_function_list (void) : fcn_map () { } ~hook_function_list (void) { } hook_function_list (const hook_function_list& lst) : fcn_map (lst.fcn_map) { } hook_function_list& operator = (const hook_function_list& lst) { if (&lst != this) fcn_map = lst.fcn_map; return *this; } bool empty (void) const { return fcn_map.empty (); } void clear (void) { fcn_map.clear (); } void insert (const std::string& id, const hook_function& f) { fcn_map[id] = f; } iterator find (const std::string& id) { return fcn_map.find (id); } const_iterator find (const std::string& id) const { return fcn_map.find (id); } iterator end (void) { return fcn_map.end (); } const_iterator end (void) const { return fcn_map.end (); } void erase (iterator p) { fcn_map.erase (p); } void run (const octave_value_list& initial_args = octave_value_list ()) { iterator p = fcn_map.begin (); while (p != fcn_map.end ()) { std::string hook_fcn_id = p->first; hook_function hook_fcn = p->second; iterator q = p++; if (hook_fcn.is_valid ()) hook_fcn.eval (initial_args); else fcn_map.erase (q); } } private: map_type fcn_map; }; #endif