Mercurial > octave-nkf
view libinterp/corefcn/oct-iostrm.cc @ 20500:44eb1102f8a8
don't recycle scanf format string if all conversions are done (bug #45808)
* oct-stream.cc, oct-stream.h (scanf_format_elt::special_conversion):
New enum value, no_conversion.
(scanf_format_list::next): If not cycling through the list, return
dummy scanf_format_elt after list has been exhausted.
(octave_base_stream::do_scanf): Only cycle through the format list
more than once if there are conversions to make and the limit on the
number of values to convert has not been reached.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 26 Aug 2015 16:05:49 -0400 |
parents | 4197fc428c7d |
children |
line wrap: on
line source
/* Copyright (C) 1996-2015 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 (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 { ::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)); }