Mercurial > octave
view libinterp/corefcn/oct-handle.h @ 23738:8acd390d16c9
don't use singleton for stream_list object
* oct-stream.h, oct-stream.cc (stream_list): Don't use singleton
pattern. Change all uses.
(stream_list::stream_list): Initialize stdin, stdout, and stderr
streams here.
(stream_list::~stream_list): Close files here.
(stream_list::m_stdin_file, stream_list::m_stdout_file,
stream_list::m_stderr_file): New data members.
(stream_list::stdin_file, stream_list::stdout_file,
stream_list::stderr_file): New functions.
* interpreter.h, interpreter.cc (interpreter::m_stream_list):
New data member.
(interpreter::interpreter): Initialize it. Don't call
initialize_file_io.
(interpreter::~interpreter): Don't call close_files.
(interpreter::get_stream_list): New function.
* file-io.h, file-io.cc (stdin_file, stdout_file, stderr_file,
stdin_stream, stdout_stream, stderr_stream): Delete static variables.
(initialize_file_io, close_files): Delete. These actions are now
handled by the stream_list constructor and destructor.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 06 Jul 2017 13:34:31 -0400 |
parents | 80c42f4cca13 |
children | 194eb4bd202b |
line wrap: on
line source
/* Copyright (C) 2007-2017 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_handle_h) #define octave_oct_handle_h 1 #include "octave-config.h" #include "dMatrix.h" #include "lo-ieee.h" #include "ov.h" // --------------------------------------------------------------------- class octave_handle { public: octave_handle (void) : val (octave::numeric_limits<double>::NaN ()) { } octave_handle (const octave_value& a) : val (octave::numeric_limits<double>::NaN ()) { if (a.isempty ()) ; // do nothing else { try { val = a.double_value (); } catch (octave::execution_exception& e) { error (e, "invalid handle"); } } } octave_handle (int a) : val (a) { } octave_handle (double a) : val (a) { } octave_handle (const octave_handle& a) : val (a.val) { } octave_handle& operator = (const octave_handle& a) { if (&a != this) val = a.val; return *this; } ~octave_handle (void) = default; double value (void) const { return val; } octave_value as_octave_value (void) const { return ok () ? octave_value (val) : octave_value (Matrix ()); } // Prefix increment/decrement operators. octave_handle& operator ++ (void) { ++val; return *this; } octave_handle& operator -- (void) { --val; return *this; } // Postfix increment/decrement operators. const octave_handle operator ++ (int) { octave_handle old_value = *this; ++(*this); return old_value; } const octave_handle operator -- (int) { octave_handle old_value = *this; --(*this); return old_value; } bool ok (void) const { return ! octave::math::isnan (val); } private: double val; }; inline bool operator == (const octave_handle& a, const octave_handle& b) { return a.value () == b.value (); } inline bool operator != (const octave_handle& a, const octave_handle& b) { return a.value () != b.value (); } inline bool operator < (const octave_handle& a, const octave_handle& b) { return a.value () < b.value (); } inline bool operator <= (const octave_handle& a, const octave_handle& b) { return a.value () <= b.value (); } inline bool operator >= (const octave_handle& a, const octave_handle& b) { return a.value () >= b.value (); } inline bool operator > (const octave_handle& a, const octave_handle& b) { return a.value () > b.value (); } #endif