Mercurial > octave
view libinterp/corefcn/oct-iostrm.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 | 21baad6b35c4 |
children | 980f39c3ab90 |
line wrap: on
line source
/* Copyright (C) 1996-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_iostrm_h) #define octave_oct_iostrm_h 1 #include "octave-config.h" #include <iosfwd> #include "oct-stream.h" class octave_base_iostream : public octave::base_stream { public: octave_base_iostream (const std::string& n = "", std::ios::openmode m = std::ios::in | std::ios::out, octave::mach_info::float_format ff = octave::mach_info::native_float_format ()) : octave::base_stream (m, ff), nm (n) { } // No copying! octave_base_iostream (const octave_base_iostream&) = delete; octave_base_iostream& operator = (const octave_base_iostream&) = delete; protected: ~octave_base_iostream (void) = default; public: // Position a stream at OFFSET relative to ORIGIN. int seek (off_t offset, int origin); // Return current stream position. off_t tell (void); // Return nonzero if EOF has been reached on this stream. bool eof (void) const; // The name of the file. std::string name (void) const { return nm; } protected: void invalid_operation (void) const; private: std::string nm; virtual const char * stream_type (void) const = 0; }; class octave_istream : public octave_base_iostream { public: octave_istream (std::istream *arg = nullptr, const std::string& n = "") : octave_base_iostream (n, std::ios::in, octave::mach_info::native_float_format ()), is (arg) { } static octave::stream create (std::istream *arg = nullptr, const std::string& n = ""); // Return nonzero if EOF has been reached on this stream. bool eof (void) const; std::istream * input_stream (void) { return is; } std::ostream * output_stream (void) { return 0; } protected: ~octave_istream (void) = default; private: std::istream *is; const char * stream_type (void) const { return "octave_istream"; } // No copying! octave_istream (const octave_istream&) = delete; octave_istream& operator = (const octave_istream&) = delete; }; class octave_ostream : public octave_base_iostream { public: octave_ostream (std::ostream *arg, const std::string& n = "") : octave_base_iostream (n, std::ios::out, octave::mach_info::native_float_format ()), os (arg) { } static octave::stream create (std::ostream *arg, const std::string& n = ""); // Return nonzero if EOF has been reached on this stream. bool eof (void) const; std::istream * input_stream (void) { return 0; } std::ostream * output_stream (void) { return os; } protected: ~octave_ostream (void) = default; private: std::ostream *os; const char * stream_type (void) const { return "octave_ostream"; } // No copying! octave_ostream (const octave_ostream&) = delete; octave_ostream& operator = (const octave_ostream&) = delete; }; #endif