Mercurial > octave-nkf
view libinterp/corefcn/c-file-ptr-stream.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 | 1663b82bd009 |
children |
line wrap: on
line source
/* Copyright (C) 2000-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_c_file_ptr_stream_h) #define octave_c_file_ptr_stream_h 1 #include <cstdio> #include <streambuf> class c_file_ptr_buf : public std::streambuf { public: #if !defined (CXX_ISO_COMPLIANT_LIBRARY) typedef int int_type; #else typedef std::streambuf::int_type int_type; #endif typedef int (*close_fcn) (FILE *); FILE* stdiofile (void) { return f; } c_file_ptr_buf (FILE *f_arg, close_fcn cf_arg = file_close) : std::streambuf (), f (f_arg), cf (cf_arg) { } ~c_file_ptr_buf (void); int_type overflow (int_type); int_type underflow (void) { return underflow_common (false); } int_type uflow (void) { return underflow_common (true); } int_type pbackfail (int_type); std::streamsize xsputn (const char*, std::streamsize); std::streamsize xsgetn (char *, std::streamsize); std::streampos seekoff (std::streamoff, std::ios::seekdir, std::ios::openmode = std::ios::in | std::ios::out); std::streampos seekpos (std::streampos, std::ios::openmode = std::ios::in | std::ios::out); int sync (void); int flush (void); int buf_close (void); int file_number () const { return f ? fileno (f) : -1; } int seek (off_t offset, int origin); off_t tell (void); void clear (void) { if (f) clearerr (f); } static int file_close (FILE *f); protected: FILE *f; close_fcn cf; private: int_type underflow_common (bool); // No copying! c_file_ptr_buf (const c_file_ptr_buf&); c_file_ptr_buf& operator = (const c_file_ptr_buf&); }; // FIXME: the following three classes could probably share some code... template <typename STREAM_T, typename FILE_T, typename BUF_T> class c_file_ptr_stream : public STREAM_T { public: c_file_ptr_stream (FILE_T f, typename BUF_T::close_fcn cf = BUF_T::file_close) : STREAM_T (0), buf (new BUF_T (f, cf)) { STREAM_T::init (buf); } ~c_file_ptr_stream (void) { delete buf; buf = 0; } BUF_T *rdbuf (void) { return buf; } void stream_close (void) { if (buf) buf->buf_close (); } int seek (off_t offset, int origin) { return buf ? buf->seek (offset, origin) : -1; } off_t tell (void) { return buf ? buf->tell () : -1; } void clear (void) { if (buf) buf->clear (); STREAM_T::clear (); } private: BUF_T *buf; // No copying! c_file_ptr_stream (const c_file_ptr_stream&); c_file_ptr_stream& operator = (const c_file_ptr_stream&); }; typedef c_file_ptr_stream<std::istream, FILE *, c_file_ptr_buf> i_c_file_ptr_stream; typedef c_file_ptr_stream<std::ostream, FILE *, c_file_ptr_buf> o_c_file_ptr_stream; typedef c_file_ptr_stream<std::iostream, FILE *, c_file_ptr_buf> io_c_file_ptr_stream; #ifdef HAVE_ZLIB #ifdef HAVE_ZLIB_H #include <zlib.h> #endif class c_zfile_ptr_buf : public std::streambuf { public: #if !defined (CXX_ISO_COMPLIANT_LIBRARY) typedef int int_type; #else typedef std::streambuf::int_type int_type; #endif typedef int (*close_fcn) (gzFile); gzFile stdiofile (void) { return f; } c_zfile_ptr_buf (gzFile f_arg, close_fcn cf_arg = file_close) : std::streambuf (), f (f_arg), cf (cf_arg) { } ~c_zfile_ptr_buf (void); int_type overflow (int_type); int_type underflow (void) { return underflow_common (false); } int_type uflow (void) { return underflow_common (true); } int_type pbackfail (int_type); std::streamsize xsputn (const char*, std::streamsize); std::streamsize xsgetn (char *, std::streamsize); std::streampos seekoff (std::streamoff, std::ios::seekdir, std::ios::openmode = std::ios::in | std::ios::out); std::streampos seekpos (std::streampos, std::ios::openmode = std::ios::in | std::ios::out); int sync (void); int flush (void); int buf_close (void); int file_number () const { return -1; } int seek (off_t offset, int origin) { return f ? gzseek (f, offset, origin) >= 0 : -1; } off_t tell (void) { return f ? gztell (f) : -1; } void clear (void) { if (f) gzclearerr (f); } static int file_close (gzFile f) { return ::gzclose (f); } protected: gzFile f; close_fcn cf; private: int_type underflow_common (bool); // No copying! c_zfile_ptr_buf (const c_zfile_ptr_buf&); c_zfile_ptr_buf& operator = (const c_zfile_ptr_buf&); }; typedef c_file_ptr_stream<std::istream, gzFile, c_zfile_ptr_buf> i_c_zfile_ptr_stream; typedef c_file_ptr_stream<std::ostream, gzFile, c_zfile_ptr_buf> o_c_zfile_ptr_stream; typedef c_file_ptr_stream<std::iostream, gzFile, c_zfile_ptr_buf> io_c_zfile_ptr_stream; #endif #endif