Mercurial > hg > octave-nkf
view libinterp/corefcn/oct-strstrm.h @ 20744: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) 1996-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_oct_strstrm_h) #define octave_oct_strstrm_h 1 #include <string> #include <sstream> #include "oct-stream.h" class octave_base_strstream : public octave_base_stream { public: octave_base_strstream (std::ios::openmode m = std::ios::out, oct_mach_info::float_format ff = oct_mach_info::native_float_format ()) : octave_base_stream (m, ff) { } // Position a stream at OFFSET relative to ORIGIN. int seek (off_t, int); // Return current stream position. virtual off_t tell (void); // The name of the file. std::string name (void) const { return std::string (); } virtual std::streambuf *rdbuf (void) = 0; virtual bool bad (void) const = 0; virtual void clear (void) = 0; protected: ~octave_base_strstream (void) { } private: // No copying! octave_base_strstream (const octave_base_strstream&); octave_base_strstream& operator = (const octave_base_strstream&); }; class octave_istrstream : public octave_base_strstream { public: octave_istrstream (const char *data, std::ios::openmode arg_md = std::ios::out, oct_mach_info::float_format ff = oct_mach_info::native_float_format ()) : octave_base_strstream (arg_md, ff), is (data) { } octave_istrstream (const std::string& data, std::ios::openmode arg_md = std::ios::out, oct_mach_info::float_format ff = oct_mach_info::native_float_format ()) : octave_base_strstream (arg_md, ff), is (data.c_str ()) { } static octave_stream create (const char *data, std::ios::openmode arg_md = std::ios::out, oct_mach_info::float_format ff = oct_mach_info::native_float_format ()); static octave_stream create (const std::string& data, std::ios::openmode arg_md = std::ios::out, oct_mach_info::float_format ff = oct_mach_info::native_float_format ()); // Return nonzero if EOF has been reached on this stream. bool eof (void) const { return is.eof (); } std::istream *input_stream (void) { return &is; } std::ostream *output_stream (void) { return 0; } off_t tell (void) { return is.tellg (); } std::streambuf *rdbuf (void) { return is ? is.rdbuf () : 0; } bool bad (void) const { return is.bad (); } void clear (void) { is.clear (); } protected: ~octave_istrstream (void) { } private: std::istringstream is; // No copying! octave_istrstream (const octave_istrstream&); octave_istrstream& operator = (const octave_istrstream&); }; class octave_ostrstream : public octave_base_strstream { public: octave_ostrstream (std::ios::openmode arg_md = std::ios::out, oct_mach_info::float_format ff = oct_mach_info::native_float_format ()) : octave_base_strstream (arg_md, ff), os () { } static octave_stream create (std::ios::openmode arg_md = std::ios::out, oct_mach_info::float_format ff = oct_mach_info::native_float_format ()); // Return nonzero if EOF has been reached on this stream. bool eof (void) const { return os.eof (); } std::istream *input_stream (void) { return 0; } std::ostream *output_stream (void) { return &os; } std::string str (void) { return os.str (); } std::streambuf *rdbuf (void) { return os ? os.rdbuf () : 0; } bool bad (void) const { return os.bad (); } void clear (void) { os.clear (); } protected: ~octave_ostrstream (void) { } private: std::ostringstream os; // No copying! octave_ostrstream (const octave_ostrstream&); octave_ostrstream& operator = (const octave_ostrstream&); }; #endif