Mercurial > hg > octave-nkf
view libinterp/interp-core/oct-iostrm.cc @ 15351:a291f850743c
modernize mxArray class hierarchy
* mxarray.in.h: Move mxArray_base class definition here from mex.cc.
Don't derive mxArray_base from mxArray. Move all virtual tags from
mxArray functions to the corresponding mxArray_base functions.
(mxArray_base::as_mxArray): New virtual function.
(mxArray::dup): Attempt as_mxArray conversion first. If that
succeeds, set name of copy. Othewise, duplicate the rep object.
(struct xmxArray): Delete.
(mxArray_base::octave_value as_octave_value): Now public.
(mxArray_octave_value::octave_value as_octave_value): Now public.
(mxArray_number::octave_value as_octave_value): Now public.
(mxArray_sparse::octave_value as_octave_value): Now public.
(mxArray_struct::octave_value as_octave_value): Now public.
(mxArray_cell::octave_value as_octave_value): Now public.
(mxArray::mxArray (const xmxArray&)): Delete.
(mxArray::mxArray (mxArray_base*, const char*)): Arg is now
mxArray_base*, not mxArray*.
(mxArray::rep): Now mxArray_base*, not mxArray*.
* mex.cc (mxArray_octave_value::dup): Return mxArray_base*, not
mxArray*. Don't attempt conversion from octave_value to mxArray here.
(mxArray_octave_value::as_mxArray): New function.
(mxArray_number::dup): Return mxArray_base*, not mxArray_number*.
(mxArray_sparse::dup): Return mxArray_base*, not mxArray_sparse*.
(mxArray_struct::dup): Return mxArray_base*, not mxArray_struct*.
(mxArray_cell::dup): Return mxArray_base*, not mxArray_dup*.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 11 Sep 2012 13:38:44 -0400 |
parents | 2fc554ffbc28 |
children | 8122286c69a9 |
line wrap: on
line source
/* Copyright (C) 1996-2012 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/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "error.h" #include "oct-iostrm.h" // Position a stream at OFFSET relative to ORIGIN. int octave_base_iostream::seek (long, int) { invalid_operation (); return -1; } // Return current stream position. long octave_base_iostream::tell (void) { invalid_operation (); return -1; } // Return non-zero 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 { ::error ("%s: invalid operation", stream_type ()); } // Return non-zero 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 non-zero 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)); }