Mercurial > octave
view libinterp/corefcn/oct-fstrm.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 | cd4e1ee28716 |
children | 194eb4bd202b |
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_fstrm_h) #define octave_oct_fstrm_h 1 #include "octave-config.h" #include <fstream> #include <string> #include "oct-stream.h" class octave_fstream : public octave::base_stream { public: octave_fstream (const std::string& nm_arg, std::ios::openmode arg_md = std::ios::in | std::ios::out, octave::mach_info::float_format flt_fmt = octave::mach_info::native_float_format ()); // No copying! octave_fstream (const octave_fstream&) = delete; octave_fstream& operator = (const octave_fstream&) = delete; static octave::stream create (const std::string& nm_arg, std::ios::openmode arg_md = std::ios::in | std::ios::out, octave::mach_info::float_format flt_fmt = octave::mach_info::native_float_format ()); // 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; void do_close (void); // The name of the file. std::string name (void) const { return nm; } std::istream * input_stream (void); std::ostream * output_stream (void); protected: ~octave_fstream (void) = default; private: std::string nm; std::fstream fs; }; #endif