view libinterp/corefcn/oct-iostrm.cc @ 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 092078913d54
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 (HAVE_CONFIG_H)
#  include "config.h"
#endif

#include <iostream>

#include "error.h"
#include "oct-iostrm.h"

// Position a stream at OFFSET relative to ORIGIN.

int
octave_base_iostream::seek (off_t, int)
{
  invalid_operation ();
  return -1;
}

// Return current stream position.

off_t
octave_base_iostream::tell (void)
{
  invalid_operation ();
  return -1;
}

// Return nonzero if EOF has been reached on this stream.

bool
octave_base_iostream::eof (void) const
{
  invalid_operation ();
  return false;
}

void
octave_base_iostream::invalid_operation (void) const
{
  // Note: use ::error to get error from error.h which halts operation.
  ::error ("%s: invalid operation", stream_type ());
}

// Return nonzero if EOF has been reached on this stream.

bool
octave_istream::eof (void) const
{
  return is && is->eof ();
}

octave::stream
octave_istream::create (std::istream *arg, const std::string& n)
{
  return octave::stream (new octave_istream (arg, n));
}

// Return nonzero if EOF has been reached on this stream.

bool
octave_ostream::eof (void) const
{
  return os && os->eof ();
}

octave::stream
octave_ostream::create (std::ostream *arg, const std::string& n)
{
  return octave::stream (new octave_ostream (arg, n));
}