octave: libinterp/corefcn/oct-stream.cc annotate

annotate libinterp/corefcn/oct-stream.cc @ 22868:87e3163f6c87

use c++11 "= default" syntax for declaration of trivial destructors * make_int.cc, Canvas.h, GenericEventNotify.h, TextEdit.h, gl-select.h, QTerminal.h, files-dock-widget.h, history-dock-widget.h, octave-cmd.h, octave-dock-widget.h, octave-interpreter.h, thread-manager.h, welcome-wizard.h, workspace-model.h, workspace-view.h, base-text-renderer.h, comment-list.h, debug.h, dynamic-ld.cc, dynamic-ld.h, ft-text-renderer.cc, gl-render.h, gl2ps-print.cc, graphics.in.h, hook-fcn.h, input.h, load-path.h, mxarray.in.h, oct-errno.h, oct-fstrm.h, oct-handle.h, oct-iostrm.h, oct-lvalue.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h, pr-output.cc, procstream.h, sighandlers.cc, symtab.h, text-renderer.h, txt-eng.h, variables.cc, workspace-element.h, __init_fltk__.cc, __init_gnuplot__.cc, ov-base-diag.h, ov-base-int.h, ov-base-scalar.h, ov-base-sparse.h, ov-base.h, ov-bool-mat.h, ov-bool-sparse.h, ov-bool.h, ov-builtin.h, ov-cell.h, ov-ch-mat.h, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-colon.h, ov-complex.cc, ov-complex.h, ov-cs-list.h, ov-cx-diag.h, ov-cx-mat.h, ov-cx-sparse.h, ov-fcn-handle.h, ov-fcn-inline.h, ov-fcn.h, ov-float.h, ov-flt-complex.h, ov-flt-cx-diag.h, ov-flt-cx-mat.h, ov-flt-re-diag.h, ov-flt-re-mat.h, ov-intx.h, ov-lazy-idx.h, ov-re-diag.h, ov-re-mat.h, ov-re-sparse.h, ov-scalar.h, ov-str-mat.h, ov-struct.h, ov-typeinfo.h, ov-usr-fcn.h, ovl.h, octave.h, lex.h, parse.h, pt-binop.h, pt-bp.h, pt-cell.h, pt-check.h, pt-classdef.h, pt-cmd.h, pt-const.h, pt-decl.h, pt-eval.h, pt-exp.h, pt-fcn-handle.h, pt-funcall.h, pt-id.h, pt-jump.h, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.h, pt-pr-code.h, pt-unop.h, pt-walk.h, pt.h, DiagArray2.h, MArray.h, MDiagArray2.h, MSparse.h, idx-vector.h, quit.h, CollocWt.h, DAE.h, DAEFunc.h, DAERT.h, DAERTFunc.h, DASPK.h, DASRT.h, DASSL.h, EIG.h, LSODE.h, ODE.h, ODEFunc.h, ODES.h, ODESFunc.h, Quad.h, aepbalance.h, base-dae.h, base-de.h, base-min.h, fEIG.h, gepbalance.h, gsvd.h, hess.h, lu.h, oct-rand.h, oct-spparms.h, qr.h, qrp.h, schur.h, sparse-lu.h, svd.h, child-list.h, file-stat.h, oct-passwd.h, oct-time.h, oct-uname.h, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, glob-match.h, lo-array-errwarn.h, lo-regexp.h, oct-mutex.h, pathsearch.h, str-vec.h, url-transfer.h:

author	John W. Eaton <jwe@octave.org>
date	Tue, 06 Dec 2016 10:59:29 -0500
parents	89756f2f085b
children	f75d289645ec

rev	line source
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1 /*
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	2
22323 bac0d6f07a3e maint: Update copyright notices for 2016. John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	3 Copyright (C) 1996-2016 John W. Eaton
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	4 Copyright (C) 2015-2016 Lachlan Andrew, Monash University
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22737 diff changeset	9 under the terms of the GNU General Public License as published by
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22737 diff changeset	10 the Free Software Foundation; either version 3 of the License, or
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22737 diff changeset	11 (at your option) any later version.
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22737 diff changeset	12
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22737 diff changeset	13 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22737 diff changeset	14 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22737 diff changeset	15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22737 diff changeset	16 GNU General Public License for more details.
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	17
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	18 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6970 diff changeset	19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6970 diff changeset	20 <http://www.gnu.org/licenses/>.
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	21
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	22 */
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	23
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21723 diff changeset	24 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21297 diff changeset	25 # include "config.h"
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	26 #endif
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	27
3268 fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	28 #include <cassert>
7709 fa41af732801 octave_scan_1: fix reading of hex numbers Jaroslav Hajek <highegg@gmail.com> parents: 7538 diff changeset	29 #include <cctype>
2215 ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	30 #include <cstring>
ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	31
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	32 #include <deque>
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	33 #include <fstream>
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3491 diff changeset	34 #include <iomanip>
9202 4b2147b25e8d clean up Array instantiation mess in oct-stream.cc Jaroslav Hajek <highegg@gmail.com> parents: 9017 diff changeset	35 #include <iostream>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	36 #include <sstream>
3535 c5ebcd5d25a9 [project @ 2000-02-02 11:55:49 by jwe] jwe parents: 3534 diff changeset	37 #include <string>
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	38
19269 65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 19123 diff changeset	39 #include "Array.h"
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	40 #include "Cell.h"
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	41 #include "byte-swap.h"
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	42 #include "lo-ieee.h"
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	43 #include "lo-mappers.h"
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	44 #include "lo-utils.h"
19269 65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 19123 diff changeset	45 #include "oct-locbuf.h"
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13271 diff changeset	46 #include "quit.h"
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13271 diff changeset	47 #include "singleton-cleanup.h"
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	48 #include "str-vec.h"
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	49
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	50 #include "error.h"
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21040 diff changeset	51 #include "errwarn.h"
3342 d8d3700fb4ab [project @ 1999-11-05 16:55:17 by jwe] jwe parents: 3341 diff changeset	52 #include "input.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: 22089 diff changeset	53 #include "interpreter.h"
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	54 #include "octave.h"
3775 13905c3a24af [project @ 2001-02-06 01:56:59 by jwe] jwe parents: 3716 diff changeset	55 #include "oct-stdstrm.h"
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	56 #include "oct-stream.h"
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	57 #include "ov.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20938 diff changeset	58 #include "ovl.h"
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	59 #include "utils.h"
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	60
20938 aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	61 // Programming Note: There are two very different error functions used
aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	62 // in the stream code. When invoked with "error (...)" the member
aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	63 // function from octave_stream or octave_base_stream is called. This
aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	64 // function sets the error state on the stream AND returns control to
aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	65 // the caller. The caller must then return a value at the end of the
aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	66 // function. When invoked with "::error (...)" the exception-based
aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	67 // error function from error.h is used. This function will throw an
aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	68 // exception and not return control to the caller. BE CAREFUL and
aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	69 // invoke the correct error function!
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	70
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	71 // Possible values for conv_err:
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	72 //
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	73 // 1 : not a real scalar
2902 c5b7a019b9ed [project @ 1997-04-30 03:46:53 by jwe] jwe parents: 2877 diff changeset	74 // 2 : value is NaN
c5b7a019b9ed [project @ 1997-04-30 03:46:53 by jwe] jwe parents: 2877 diff changeset	75 // 3 : value is not an integer
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	76
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	77 static int
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	78 convert_to_valid_int (const octave_value& tc, int& conv_err)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	79 {
20747 ee2743bd07a8 eliminate various compiler warnings John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	80 conv_err = 0;
ee2743bd07a8 eliminate various compiler warnings John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	81
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	82 int retval = 0;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	83
20747 ee2743bd07a8 eliminate various compiler warnings John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	84 double dval = 0.0;
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	85
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	86 try
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	87 {
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	88 dval = tc.double_value ();
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	89 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	90 catch (const octave::execution_exception&)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	91 {
20756 200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20747 diff changeset	92 recover_from_exception ();
200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20747 diff changeset	93
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	94 conv_err = 1;
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	95 }
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	96
20747 ee2743bd07a8 eliminate various compiler warnings John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	97 if (! conv_err)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	98 {
5389 25c8956d2204 [project @ 2005-06-15 03:45:46 by jwe] jwe parents: 5353 diff changeset	99 if (! lo_ieee_isnan (dval))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	100 {
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21777 diff changeset	101 int ival = octave::math::nint (dval);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	102
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	103 if (ival == dval)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	104 retval = ival;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	105 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	106 conv_err = 3;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	107 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	108 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	109 conv_err = 2;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	110 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	111
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	112 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	113 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	114
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	115 static int
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	116 get_size (double d, const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	117 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	118 int retval = -1;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	119
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	120 if (lo_ieee_isnan (d))
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	121 ::error ("%s: NaN is invalid as size specification", who.c_str ());
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	122
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21777 diff changeset	123 if (octave::math::isinf (d))
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	124 retval = -1;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	125 else
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	126 {
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	127 if (d < 0.0)
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	128 ::error ("%s: negative value invalid as size specification",
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	129 who.c_str ());
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	130
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21777 diff changeset	131 retval = octave::math::nint (d);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	132 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	133
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	134 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	135 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	136
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	137 static void
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	138 get_size (const Array<double>& size, octave_idx_type& nr, octave_idx_type& nc,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	139 bool& one_elt_size_spec, const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	140 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	141 nr = -1;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	142 nc = -1;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	143
3268 fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	144 one_elt_size_spec = false;
fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	145
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	146 double dnr = -1.0;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	147 double dnc = -1.0;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	148
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20230 diff changeset	149 octave_idx_type sz_len = size.numel ();
3810 f19f00339363 [project @ 2001-03-29 21:03:01 by jwe] jwe parents: 3779 diff changeset	150
f19f00339363 [project @ 2001-03-29 21:03:01 by jwe] jwe parents: 3779 diff changeset	151 if (sz_len == 1)
2601 3723512a827a [project @ 1997-01-06 05:43:16 by jwe] jwe parents: 2600 diff changeset	152 {
3268 fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	153 one_elt_size_spec = true;
fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	154
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	155 dnr = size(0);
4293 977f977fb2c3 [project @ 2003-01-06 18:18:14 by jwe] jwe parents: 4257 diff changeset	156
977f977fb2c3 [project @ 2003-01-06 18:18:14 by jwe] jwe parents: 4257 diff changeset	157 dnc = (dnr == 0.0) ? 0.0 : 1.0;
2601 3723512a827a [project @ 1997-01-06 05:43:16 by jwe] jwe parents: 2600 diff changeset	158 }
3810 f19f00339363 [project @ 2001-03-29 21:03:01 by jwe] jwe parents: 3779 diff changeset	159 else if (sz_len == 2)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	160 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	161 dnr = size(0);
3810 f19f00339363 [project @ 2001-03-29 21:03:01 by jwe] jwe parents: 3779 diff changeset	162
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21777 diff changeset	163 if (octave::math::isinf (dnr))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	164 ::error ("%s: invalid size specification", who.c_str ());
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	165
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	166 dnc = size(1);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	167 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	168 else
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	169 ::error ("%s: invalid size specification", who.c_str ());
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	170
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20465 diff changeset	171 nr = get_size (dnr, who);
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20465 diff changeset	172
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20465 diff changeset	173 if (dnc >= 0.0)
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20465 diff changeset	174 nc = get_size (dnc, who);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	175 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	176
21477 4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	177 class
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	178 scanf_format_elt
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	179 {
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	180 public:
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	181
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	182 enum special_conversion
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	183 {
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	184 whitespace_conversion = 1,
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	185 literal_conversion = 2,
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	186 null = 3
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	187 };
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	188
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	189 scanf_format_elt (const char *txt = 0, int w = 0, bool d = false,
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	190 char typ = '\0', char mod = '\0',
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	191 const std::string& ch_class = "")
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	192 : text (strsave (txt)), width (w), discard (d), type (typ),
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	193 modifier (mod), char_class (ch_class)
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	194 { }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	195
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	196 scanf_format_elt (const scanf_format_elt& e)
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	197 : text (strsave (e.text)), width (e.width), discard (e.discard),
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	198 type (e.type), modifier (e.modifier), char_class (e.char_class)
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	199 { }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	200
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	201 scanf_format_elt& operator = (const scanf_format_elt& e)
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	202 {
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	203 if (this != &e)
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	204 {
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	205 text = strsave (e.text);
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	206 width = e.width;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	207 discard = e.discard;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	208 type = e.type;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	209 modifier = e.modifier;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	210 char_class = e.char_class;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	211 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	212
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	213 return *this;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	214 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	215
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	216 ~scanf_format_elt (void) { delete [] text; }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	217
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	218 // The C-style format string.
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	219 const char *text;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	220
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	221 // The maximum field width.
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	222 int width;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	223
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	224 // TRUE if we are not storing the result of this conversion.
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	225 bool discard;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	226
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	227 // Type of conversion -- 'd', 'i', 'o', 'u', 'x', 'e', 'f', 'g',
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	228 // 'c', 's', 'p', '%', or '['.
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	229 char type;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	230
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	231 // A length modifier -- 'h', 'l', or 'L'.
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	232 char modifier;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	233
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	234 // The class of characters in a '[' format.
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	235 std::string char_class;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	236 };
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	237
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	238 class
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	239 scanf_format_list
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	240 {
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	241 public:
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	242
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	243 scanf_format_list (const std::string& fmt = "");
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	244
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	245 ~scanf_format_list (void);
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	246
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	247 octave_idx_type num_conversions (void) { return nconv; }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	248
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	249 // The length can be different than the number of conversions.
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	250 // For example, "x %d y %d z" has 2 conversions but the length of
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	251 // the list is 3 because of the characters that appear after the
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	252 // last conversion.
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	253
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	254 size_t length (void) const { return fmt_elts.size (); }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	255
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	256 const scanf_format_elt *first (void)
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	257 {
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	258 curr_idx = 0;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	259 return current ();
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	260 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	261
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	262 const scanf_format_elt *current (void) const
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	263 {
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	264 return length () > 0 ? fmt_elts[curr_idx] : 0;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	265 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	266
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	267 const scanf_format_elt *next (bool cycle = true)
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	268 {
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	269 static scanf_format_elt dummy
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	270 (0, 0, false, scanf_format_elt::null, '\0', "");
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	271
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	272 curr_idx++;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	273
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	274 if (curr_idx >= length ())
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	275 {
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	276 if (cycle)
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	277 curr_idx = 0;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	278 else
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	279 return &dummy;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	280 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	281
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	282 return current ();
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	283 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	284
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	285 void printme (void) const;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	286
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	287 bool ok (void) const { return (nconv >= 0); }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	288
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	289 operator bool () const { return ok (); }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	290
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	291 bool all_character_conversions (void);
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	292
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	293 bool all_numeric_conversions (void);
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	294
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	295 private:
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	296
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	297 // Number of conversions specified by this format string, or -1 if
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	298 // invalid conversions have been found.
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	299 octave_idx_type nconv;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	300
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	301 // Index to current element;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	302 size_t curr_idx;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	303
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	304 // List of format elements.
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	305 std::deque<scanf_format_elt*> fmt_elts;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	306
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	307 // Temporary buffer.
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	308 std::ostringstream buf;
21477 4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	309
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	310 void add_elt_to_list (int width, bool discard, char type, char modifier,
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	311 const std::string& char_class = "");
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	312
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	313 void process_conversion (const std::string& s, size_t& i, size_t n,
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	314 int& width, bool& discard, char& type,
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	315 char& modifier);
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	316
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	317 int finish_conversion (const std::string& s, size_t& i, size_t n,
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	318 int& width, bool discard, char& type,
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	319 char modifier);
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	320 // No copying!
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	321
22865 89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	322 scanf_format_list (const scanf_format_list&) = delete;
89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	323
89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	324 scanf_format_list& operator = (const scanf_format_list&) = delete;
21477 4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	325 };
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	326
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	327 scanf_format_list::scanf_format_list (const std::string& s)
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	328 : nconv (0), curr_idx (0), fmt_elts (), buf ()
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	329 {
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	330 size_t n = s.length ();
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	331
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	332 size_t i = 0;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	333
2215 ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	334 int width = 0;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	335 bool discard = false;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	336 char modifier = '\0';
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	337 char type = '\0';
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	338
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	339 bool have_more = true;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	340
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	341 while (i < n)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	342 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	343 have_more = true;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	344
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	345 if (s[i] == '%')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	346 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	347 // Process percent-escape conversion type.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	348
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	349 process_conversion (s, i, n, width, discard, type, modifier);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	350
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	351 have_more = (buf.tellp () != 0);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	352 }
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	353 else if (isspace (s[i]))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	354 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	355 type = scanf_format_elt::whitespace_conversion;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	356
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	357 width = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	358 discard = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	359 modifier = '\0';
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	360 buf << " ";
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	361
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	362 while (++i < n && isspace (s[i]))
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	363 ; // skip whitespace
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	364
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	365 add_elt_to_list (width, discard, type, modifier);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	366
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	367 have_more = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	368 }
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	369 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	370 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	371 type = scanf_format_elt::literal_conversion;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	372
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	373 width = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	374 discard = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	375 modifier = '\0';
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	376
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	377 while (i < n && ! isspace (s[i]) && s[i] != '%')
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	378 buf << s[i++];
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	379
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	380 add_elt_to_list (width, discard, type, modifier);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	381
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	382 have_more = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	383 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	384
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	385 if (nconv < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	386 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	387 have_more = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	388 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	389 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	390 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	391
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	392 if (have_more)
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	393 add_elt_to_list (width, discard, type, modifier);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	394
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	395 buf.clear ();
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	396 buf.str ("");
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	397 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	398
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	399 scanf_format_list::~scanf_format_list (void)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	400 {
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	401 size_t n = fmt_elts.size ();
4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	402
4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	403 for (size_t i = 0; i < n; i++)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	404 {
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	405 scanf_format_elt *elt = fmt_elts[i];
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	406 delete elt;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11574 diff changeset	407 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	408 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	409
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	410 void
2215 ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	411 scanf_format_list::add_elt_to_list (int width, bool discard, char type,
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	412 char modifier,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	413 const std::string& char_class)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	414 {
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	415 std::string text = buf.str ();
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	416
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	417 if (! text.empty ())
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	418 {
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	419 scanf_format_elt *elt
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	420 = new scanf_format_elt (text.c_str (), width, discard, type,
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	421 modifier, char_class);
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	422
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	423 fmt_elts.push_back (elt);
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	424 }
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	425
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	426 buf.clear ();
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	427 buf.str ("");
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	428 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	429
3535 c5ebcd5d25a9 [project @ 2000-02-02 11:55:49 by jwe] jwe parents: 3534 diff changeset	430 static std::string
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	431 expand_char_class (const std::string& s)
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	432 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	433 std::string retval;
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	434
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	435 size_t len = s.length ();
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	436
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	437 size_t i = 0;
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	438
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	439 while (i < len)
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	440 {
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	441 unsigned char c = s[i++];
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	442
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	443 if (c == '-' && i > 1 && i < len
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	444 && ( static_cast<unsigned char> (s[i-2])
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	445 <= static_cast<unsigned char> (s[i])))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	446 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	447 // Add all characters from the range except the first (we
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	448 // already added it below).
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	449
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	450 for (c = s[i-2]+1; c < s[i]; c++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	451 retval += c;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	452 }
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	453 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	454 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	455 // Add the character to the class. Only add '-' if it is
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	456 // the last character in the class.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	457
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	458 if (c != '-' \|\| i == len)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	459 retval += c;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	460 }
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	461 }
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	462
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	463 return retval;
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	464 }
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	465
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	466 void
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	467 scanf_format_list::process_conversion (const std::string& s, size_t& i,
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	468 size_t n, int& width, bool& discard,
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	469 char& type, char& modifier)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	470 {
2215 ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	471 width = 0;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	472 discard = false;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	473 modifier = '\0';
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	474 type = '\0';
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	475
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	476 buf << s[i++];
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	477
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	478 bool have_width = false;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	479
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	480 while (i < n)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	481 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	482 switch (s[i])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	483 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	484 case '*':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	485 if (discard)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	486 nconv = -1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	487 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	488 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	489 discard = true;
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	490 buf << s[i++];
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	491 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	492 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	493
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	494 case '0': case '1': case '2': case '3': case '4':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	495 case '5': case '6': case '7': case '8': case '9':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	496 if (have_width)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	497 nconv = -1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	498 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	499 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	500 char c = s[i++];
20230 e914b5399c67 Use in-place operators in C++ code where possible. Rik <rik@octave.org> parents: 19864 diff changeset	501 width = 10 * width + c - '0';
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	502 have_width = true;
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	503 buf << c;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	504 while (i < n && isdigit (s[i]))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	505 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	506 c = s[i++];
20230 e914b5399c67 Use in-place operators in C++ code where possible. Rik <rik@octave.org> parents: 19864 diff changeset	507 width = 10 * width + c - '0';
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	508 buf << c;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	509 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	510 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	511 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	512
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	513 case 'h': case 'l': case 'L':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	514 if (modifier != '\0')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	515 nconv = -1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	516 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	517 modifier = s[i++];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	518 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	519
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	520 case 'd': case 'i': case 'o': case 'u': case 'x':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	521 if (modifier == 'L')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	522 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	523 nconv = -1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	524 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	525 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	526 goto fini;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	527
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	528 case 'e': case 'f': case 'g':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	529 if (modifier == 'h')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	530 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	531 nconv = -1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	532 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	533 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	534
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	535 // No float or long double conversions, thanks.
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	536 buf << 'l';
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	537
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	538 goto fini;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	539
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	540 case 'c': case 's': case 'p': case '%': case '[':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	541 if (modifier != '\0')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	542 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	543 nconv = -1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	544 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	545 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	546 goto fini;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	547
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	548 fini:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	549 {
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	550 if (finish_conversion (s, i, n, width, discard,
4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	551 type, modifier) == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	552 return;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	553 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	554 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	555
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	556 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	557 nconv = -1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	558 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	559 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	560
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	561 if (nconv < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	562 break;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	563 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	564
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	565 nconv = -1;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	566 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	567
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	568 int
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	569 scanf_format_list::finish_conversion (const std::string& s, size_t& i,
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	570 size_t n, int& width, bool discard,
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	571 char& type, char modifier)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	572 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	573 int retval = 0;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	574
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	575 std::string char_class;
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	576
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	577 size_t beg_idx = std::string::npos;
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	578 size_t end_idx = std::string::npos;
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	579
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	580 if (s[i] == '%')
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	581 {
d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	582 type = '%';
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	583 buf << s[i++];
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	584 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	585 else
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	586 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	587 type = s[i];
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	588
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	589 if (s[i] == '[')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	590 {
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	591 buf << s[i++];
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	592
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	593 if (i < n)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	594 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	595 beg_idx = i;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	596
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	597 if (s[i] == '^')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	598 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	599 type = '^';
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	600 buf << s[i++];
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	601
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	602 if (i < n)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	603 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	604 beg_idx = i;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	605
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	606 if (s[i] == ']')
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	607 buf << s[i++];
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	608 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	609 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	610 else if (s[i] == ']')
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	611 buf << s[i++];
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	612 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	613
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	614 while (i < n && s[i] != ']')
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	615 buf << s[i++];
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	616
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	617 if (i < n && s[i] == ']')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	618 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	619 end_idx = i-1;
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	620 buf << s[i++];
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	621 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	622
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	623 if (s[i-1] != ']')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	624 retval = nconv = -1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	625 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	626 else
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	627 buf << s[i++];
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	628
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	629 nconv++;
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	630 }
d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	631
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	632 if (nconv >= 0)
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	633 {
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	634 if (beg_idx != std::string::npos && end_idx != std::string::npos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	635 char_class = expand_char_class (s.substr (beg_idx,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	636 end_idx - beg_idx + 1));
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	637
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	638 add_elt_to_list (width, discard, type, modifier, char_class);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	639 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	640
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	641 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	642 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	643
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	644 void
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	645 scanf_format_list::printme (void) const
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	646 {
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	647 size_t n = fmt_elts.size ();
4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	648
4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	649 for (size_t i = 0; i < n; i++)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	650 {
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	651 scanf_format_elt *elt = fmt_elts[i];
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	652
3531 97cf542676e1 [project @ 2000-02-02 11:30:40 by jwe] jwe parents: 3523 diff changeset	653 std::cerr
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	654 << "width: " << elt->width << "\n"
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	655 << "discard: " << elt->discard << "\n"
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	656 << "type: ";
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	657
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	658 if (elt->type == scanf_format_elt::literal_conversion)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	659 std::cerr << "literal text\n";
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	660 else if (elt->type == scanf_format_elt::whitespace_conversion)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	661 std::cerr << "whitespace\n";
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	662 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	663 std::cerr << elt->type << "\n";
3531 97cf542676e1 [project @ 2000-02-02 11:30:40 by jwe] jwe parents: 3523 diff changeset	664
97cf542676e1 [project @ 2000-02-02 11:30:40 by jwe] jwe parents: 3523 diff changeset	665 std::cerr
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	666 << "modifier: " << elt->modifier << "\n"
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	667 << "char_class: '" << undo_string_escapes (elt->char_class) << "'\n"
d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	668 << "text: '" << undo_string_escapes (elt->text) << "'\n\n";
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	669 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	670 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	671
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	672 bool
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	673 scanf_format_list::all_character_conversions (void)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	674 {
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	675 size_t n = fmt_elts.size ();
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	676
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	677 if (n > 0)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	678 {
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	679 for (size_t i = 0; i < n; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	680 {
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	681 scanf_format_elt *elt = fmt_elts[i];
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	682
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	683 switch (elt->type)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	684 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	685 case 'c': case 's': case '%': case '[': case '^':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	686 case scanf_format_elt::literal_conversion:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	687 case scanf_format_elt::whitespace_conversion:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	688 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	689
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	690 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	691 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	692 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	693 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	694 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	695
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	696 return true;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	697 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	698 else
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	699 return false;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	700 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	701
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	702 bool
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	703 scanf_format_list::all_numeric_conversions (void)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	704 {
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	705 size_t n = fmt_elts.size ();
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	706
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	707 if (n > 0)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	708 {
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	709 for (size_t i = 0; i < n; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	710 {
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	711 scanf_format_elt *elt = fmt_elts[i];
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	712
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	713 switch (elt->type)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	714 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	715 case 'd': case 'i': case 'o': case 'u': case 'x':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	716 case 'e': case 'f': case 'g':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	717 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	718
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	719 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	720 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	721 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	722 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	723 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	724
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	725 return true;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	726 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	727 else
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	728 return false;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	729 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	730
21477 4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	731 class
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	732 printf_format_elt
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	733 {
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	734 public:
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	735
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	736 printf_format_elt (const char *txt = 0, int n = 0, int w = -1,
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	737 int p = -1, const std::string& f = "",
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	738 char typ = '\0', char mod = '\0')
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	739 : text (strsave (txt)), args (n), fw (w), prec (p), flags (f),
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	740 type (typ), modifier (mod)
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	741 { }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	742
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	743 printf_format_elt (const printf_format_elt& e)
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	744 : text (strsave (e.text)), args (e.args), fw (e.fw), prec (e.prec),
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	745 flags (e.flags), type (e.type), modifier (e.modifier)
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	746 { }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	747
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	748 printf_format_elt& operator = (const printf_format_elt& e)
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	749 {
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	750 if (this != &e)
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	751 {
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	752 text = strsave (e.text);
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	753 args = e.args;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	754 fw = e.fw;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	755 prec = e.prec;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	756 flags = e.flags;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	757 type = e.type;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	758 modifier = e.modifier;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	759 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	760
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	761 return *this;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	762 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	763
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	764 ~printf_format_elt (void) { delete [] text; }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	765
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	766 // The C-style format string.
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	767 const char *text;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	768
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	769 // How many args do we expect to consume?
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	770 int args;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	771
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	772 // Field width.
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	773 int fw;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	774
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	775 // Precision.
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	776 int prec;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	777
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	778 // Flags -- '-', '+', ' ', '0', or '#'.
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	779 std::string flags;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	780
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	781 // Type of conversion -- 'd', 'i', 'o', 'x', 'X', 'u', 'c', 's',
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	782 // 'f', 'e', 'E', 'g', 'G', 'p', or '%'
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	783 char type;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	784
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	785 // A length modifier -- 'h', 'l', or 'L'.
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	786 char modifier;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	787 };
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	788
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	789 class
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	790 printf_format_list
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	791 {
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	792 public:
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	793
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	794 printf_format_list (const std::string& fmt = "");
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	795
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	796 ~printf_format_list (void);
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	797
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	798 octave_idx_type num_conversions (void) { return nconv; }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	799
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	800 const printf_format_elt *first (void)
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	801 {
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	802 curr_idx = 0;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	803 return current ();
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	804 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	805
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	806 const printf_format_elt *current (void) const
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	807 {
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	808 return length () > 0 ? fmt_elts[curr_idx] : 0;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	809 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	810
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	811 size_t length (void) const { return fmt_elts.size (); }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	812
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	813 const printf_format_elt *next (bool cycle = true)
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	814 {
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	815 curr_idx++;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	816
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	817 if (curr_idx >= length ())
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	818 {
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	819 if (cycle)
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	820 curr_idx = 0;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	821 else
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	822 return 0;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	823 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	824
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	825 return current ();
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	826 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	827
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	828 bool last_elt_p (void) { return (curr_idx + 1 == length ()); }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	829
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	830 void printme (void) const;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	831
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	832 bool ok (void) const { return (nconv >= 0); }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	833
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	834 operator bool () const { return ok (); }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	835
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	836 private:
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	837
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	838 // Number of conversions specified by this format string, or -1 if
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	839 // invalid conversions have been found.
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	840 octave_idx_type nconv;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	841
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	842 // Index to current element;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	843 size_t curr_idx;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	844
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	845 // List of format elements.
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	846 std::deque<printf_format_elt*> fmt_elts;
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	847
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	848 // Temporary buffer.
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	849 std::ostringstream buf;
21477 4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	850
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	851 void add_elt_to_list (int args, const std::string& flags, int fw,
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	852 int prec, char type, char modifier);
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	853
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	854 void process_conversion (const std::string& s, size_t& i, size_t n,
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	855 int& args, std::string& flags, int& fw,
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	856 int& prec, char& modifier, char& type);
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	857
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	858 void finish_conversion (const std::string& s, size_t& i, int args,
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	859 const std::string& flags, int fw, int prec,
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	860 char modifier, char& type);
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	861
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	862 // No copying!
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	863
22865 89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	864 printf_format_list (const printf_format_list&) = delete;
89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	865
89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	866 printf_format_list& operator = (const printf_format_list&) = delete;
21477 4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	867 };
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	868
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	869 printf_format_list::printf_format_list (const std::string& s)
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	870 : nconv (0), curr_idx (0), fmt_elts (), buf ()
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	871 {
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	872 size_t n = s.length ();
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	873
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	874 size_t i = 0;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	875
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	876 int args = 0;
3643 3af6d00b82ed [project @ 2000-03-24 10:53:21 by jwe] jwe parents: 3640 diff changeset	877 std::string flags;
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	878 int fw = -1;
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	879 int prec = -1;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	880 char modifier = '\0';
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	881 char type = '\0';
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	882
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	883 bool have_more = true;
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	884 bool empty_buf = true;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	885
4223 5ebaf7eee36e [project @ 2002-12-17 23:54:34 by jwe] jwe parents: 4153 diff changeset	886 if (n == 0)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	887 {
4223 5ebaf7eee36e [project @ 2002-12-17 23:54:34 by jwe] jwe parents: 4153 diff changeset	888 printf_format_elt *elt
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	889 = new printf_format_elt ("", args, fw, prec, flags, type, modifier);
4223 5ebaf7eee36e [project @ 2002-12-17 23:54:34 by jwe] jwe parents: 4153 diff changeset	890
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	891 fmt_elts.push_back (elt);
4223 5ebaf7eee36e [project @ 2002-12-17 23:54:34 by jwe] jwe parents: 4153 diff changeset	892 }
5ebaf7eee36e [project @ 2002-12-17 23:54:34 by jwe] jwe parents: 4153 diff changeset	893 else
5ebaf7eee36e [project @ 2002-12-17 23:54:34 by jwe] jwe parents: 4153 diff changeset	894 {
5ebaf7eee36e [project @ 2002-12-17 23:54:34 by jwe] jwe parents: 4153 diff changeset	895 while (i < n)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	896 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	897 have_more = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	898
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	899 empty_buf = (buf.tellp () == 0);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	900
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	901 switch (s[i])
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	902 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	903 case '%':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	904 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	905 if (empty_buf)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	906 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	907 process_conversion (s, i, n, args, flags, fw, prec,
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	908 type, modifier);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	909
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	910 // If there is nothing in the buffer, then
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	911 // add_elt_to_list must have just been called, so we
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	912 // are already done with the current element and we
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	913 // don't need to call add_elt_to_list if this is our
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	914 // last trip through the loop.
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	915
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	916 have_more = (buf.tellp () != 0);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	917 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	918 else
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	919 add_elt_to_list (args, flags, fw, prec, type, modifier);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	920 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	921 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	922
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	923 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	924 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	925 args = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	926 flags = "";
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	927 fw = -1;
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	928 prec = -1;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	929 modifier = '\0';
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	930 type = '\0';
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	931 buf << s[i++];
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	932 empty_buf = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	933 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	934 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	935 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	936
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	937 if (nconv < 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	938 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	939 have_more = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	940 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	941 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	942 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	943
4223 5ebaf7eee36e [project @ 2002-12-17 23:54:34 by jwe] jwe parents: 4153 diff changeset	944 if (have_more)
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	945 add_elt_to_list (args, flags, fw, prec, type, modifier);
4223 5ebaf7eee36e [project @ 2002-12-17 23:54:34 by jwe] jwe parents: 4153 diff changeset	946
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	947 buf.clear ();
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	948 buf.str ("");
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	949 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	950 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	951
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	952 printf_format_list::~printf_format_list (void)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	953 {
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	954 size_t n = fmt_elts.size ();
4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	955
4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	956 for (size_t i = 0; i < n; i++)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	957 {
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	958 printf_format_elt *elt = fmt_elts[i];
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	959 delete elt;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11574 diff changeset	960 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	961 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	962
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	963 void
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	964 printf_format_list::add_elt_to_list (int args, const std::string& flags,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	965 int fw, int prec, char type,
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	966 char modifier)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	967 {
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	968 std::string text = buf.str ();
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	969
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	970 if (! text.empty ())
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	971 {
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	972 printf_format_elt *elt
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	973 = new printf_format_elt (text.c_str (), args, fw, prec, flags,
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	974 type, modifier);
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	975
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	976 fmt_elts.push_back (elt);
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	977 }
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	978
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	979 buf.clear ();
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	980 buf.str ("");
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	981 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	982
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	983 void
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	984 printf_format_list::process_conversion (const std::string& s, size_t& i,
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	985 size_t n, int& args,
4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	986 std::string& flags, int& fw,
4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	987 int& prec, char& modifier,
4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	988 char& type)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	989 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	990 args = 0;
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	991 flags = "";
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	992 fw = -1;
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	993 prec = -1;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	994 modifier = '\0';
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	995 type = '\0';
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	996
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	997 buf << s[i++];
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	998
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4574 diff changeset	999 bool nxt = false;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1000
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1001 while (i < n)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1002 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1003 switch (s[i])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1004 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1005 case '-': case '+': case ' ': case '0': case '#':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1006 flags += s[i];
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	1007 buf << s[i++];
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1008 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1009
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1010 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1011 nxt = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1012 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1013 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1014
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4574 diff changeset	1015 if (nxt)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1016 break;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1017 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1018
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1019 if (i < n)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1020 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1021 if (s[i] == '*')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1022 {
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1023 fw = -2;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1024 args++;
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	1025 buf << s[i++];
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1026 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1027 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1028 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1029 if (isdigit (s[i]))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1030 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1031 int nn = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1032 std::string tmp = s.substr (i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1033 sscanf (tmp.c_str (), "%d%n", &fw, &nn);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1034 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1035
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1036 while (i < n && isdigit (s[i]))
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	1037 buf << s[i++];
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1038 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1039 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1040
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1041 if (i < n && s[i] == '.')
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1042 {
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1043 // nothing before the . means 0.
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1044 if (fw == -1)
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1045 fw = 0;
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1046
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1047 // . followed by nothing is 0.
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1048 prec = 0;
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1049
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	1050 buf << s[i++];
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1051
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1052 if (i < n)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1053 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1054 if (s[i] == '*')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1055 {
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	1056 prec = -2;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1057 args++;
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	1058 buf << s[i++];
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1059 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1060 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1061 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1062 if (isdigit (s[i]))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1063 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1064 int nn = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1065 std::string tmp = s.substr (i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1066 sscanf (tmp.c_str (), "%d%n", &prec, &nn);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1067 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1068
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1069 while (i < n && isdigit (s[i]))
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	1070 buf << s[i++];
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1071 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1072 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1073 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1074
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1075 if (i < n)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1076 {
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	1077 // Accept and record modifier, but don't place it in the format
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	1078 // item text. All integer conversions are handled as 64-bit
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	1079 // integers.
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	1080
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1081 switch (s[i])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1082 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1083 case 'h': case 'l': case 'L':
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	1084 modifier = s[i++];
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1085 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1086
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1087 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1088 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1089 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1090 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1091
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1092 if (i < n)
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	1093 finish_conversion (s, i, args, flags, fw, prec, modifier, type);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1094 else
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1095 nconv = -1;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1096 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1097
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1098 void
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1099 printf_format_list::finish_conversion (const std::string& s, size_t& i,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1100 int args, const std::string& flags,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1101 int fw, int prec, char modifier,
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	1102 char& type)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1103 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1104 switch (s[i])
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1105 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1106 case 'd': case 'i': case 'o': case 'x': case 'X':
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1107 case 'u': case 'c':
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1108 if (modifier == 'L')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1109 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1110 nconv = -1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1111 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1112 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1113 goto fini;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1114
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1115 case 'f': case 'e': case 'E': case 'g': case 'G':
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1116 if (modifier == 'h' \|\| modifier == 'l')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1117 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1118 nconv = -1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1119 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1120 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1121 goto fini;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1122
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1123 case 's': case 'p': case '%':
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1124 if (modifier != '\0')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1125 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1126 nconv = -1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1127 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1128 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1129 goto fini;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1130
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1131 fini:
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1132
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	1133 type = s[i];
d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	1134
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	1135 buf << s[i++];
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	1136
d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	1137 if (type != '%' \|\| args != 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1138 nconv++;
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	1139
d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	1140 if (type != '%')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1141 args++;
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	1142
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	1143 add_elt_to_list (args, flags, fw, prec, type, modifier);
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	1144
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1145 break;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1146
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1147 default:
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1148 nconv = -1;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1149 break;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1150 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1151 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1152
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1153 void
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1154 printf_format_list::printme (void) const
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1155 {
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	1156 size_t n = fmt_elts.size ();
4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	1157
4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	1158 for (size_t i = 0; i < n; i++)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1159 {
21475 4f3e63d75f33 use std::deque instead of Array to hold scanf and printf format elements John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	1160 printf_format_elt *elt = fmt_elts[i];
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1161
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	1162 std::cerr
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1163 << "args: " << elt->args << "\n"
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1164 << "flags: '" << elt->flags << "'\n"
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1165 << "width: " << elt->fw << "\n"
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1166 << "prec: " << elt->prec << "\n"
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1167 << "type: '" << elt->type << "'\n"
d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1168 << "modifier: '" << elt->modifier << "'\n"
d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1169 << "text: '" << undo_string_escapes (elt->text) << "'\n\n";
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1170 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1171 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1172
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1173 // Calculate x^n. Used for ...e+nn so that, for example, 1e2 is
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1174 // exactly 100 and 5e-1 is 1/2
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1175
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1176 static double
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1177 pown (double x, unsigned int n)
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1178 {
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1179 double retval = 1;
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1180
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1181 for (unsigned int d = n; d; d >>= 1)
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1182 {
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1183 if (d & 1)
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1184 retval *= x;
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1185 x *= x;
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1186 }
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1187
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1188 return retval;
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1189 }
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1190
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1191 static Cell
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1192 init_inf_nan (void)
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1193 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1194 Cell retval (dim_vector (1, 2));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1195
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1196 retval(0) = Cell (octave_value ("inf"));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1197 retval(1) = Cell (octave_value ("nan"));
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1198
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1199 return retval;
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1200 }
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1201
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1202 namespace octave
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1203 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1204 // Delimited stream, optimized to read strings of characters separated
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1205 // by single-character delimiters.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1206 //
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1207 // The reason behind this class is that octstream doesn't provide
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1208 // seek/tell, but the opportunity has been taken to optimise for the
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1209 // textscan workload.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1210 //
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1211 // The function reads chunks into a 4kiB buffer, and marks where the
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1212 // last delimiter occurs. Reads up to this delimiter can be fast.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1213 // After that last delimiter, the remaining text is moved to the front
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1214 // of the buffer and the buffer is refilled. This also allows cheap
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1215 // seek and tell operations within a "fast read" block.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1216
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1217 class
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1218 delimited_stream
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1219 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1220 public:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1221
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1222 delimited_stream (std::istream& is, const std::string& delimiters,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1223 int longest_lookahead, octave_idx_type bsize = 4096);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1224
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1225 delimited_stream (std::istream& is, const delimited_stream& ds);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1226
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1227 ~delimited_stream (void);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1228
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1229 // Called when optimized sequence of get is finished. Ensures that
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1230 // there is a remaining delimiter in buf, or loads more data in.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1231 void field_done (void)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1232 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1233 if (idx >= last)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1234 refresh_buf ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1235 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1236
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1237 // Load new data into buffer, and set eob, last, idx.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1238 // Return EOF at end of file, 0 otherwise.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1239 int refresh_buf (void);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1240
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1241 // Get a character, relying on caller to call field_done if
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1242 // a delimiter has been reached.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1243 int get (void)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1244 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1245 if (delimited)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1246 return eof () ? std::istream::traits_type::eof () : *idx++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1247 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1248 return get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1249 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1250
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1251 // Get a character, checking for underrun of the buffer.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1252 int get_undelim (void);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1253
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1254 // Read character that will be got by the next get.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1255 int peek (void) { return eof () ? std::istream::traits_type::eof () : *idx; }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1256
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1257 // Read character that will be got by the next get.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1258 int peek_undelim (void);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1259
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1260 // Undo a 'get' or 'get_undelim'. It is the caller's responsibility
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1261 // to avoid overflow by calling putbacks only for a character got by
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1262 // get() or get_undelim(), with no intervening
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1263 // get, get_delim, field_done, refresh_buf, getline, read or seekg.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1264 void putback (char /ch/ = 0) { if (! eof ()) --idx; }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1265
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1266 int getline (std::string& dest, char delim);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1267
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1268 // int skipline (char delim);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1269
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1270 char read (char buffer, int size, char* &new_start);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1271
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1272 // Return a position suitable to "seekg", valid only within this
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1273 // block between calls to field_done.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1274 char *tellg (void) { return idx; }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1275
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1276 void seekg (char *old_idx) { idx = old_idx; }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1277
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1278 bool eof (void)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1279 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1280 return (eob == buf && i_stream.eof ()) \|\| (flags & std::ios_base::eofbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1281 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1282
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1283 operator const void* (void) { return (! eof () && ! flags) ? this : 0; }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1284
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1285 bool fail (void) { return flags & std::ios_base::failbit; }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1286
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1287 std::ios_base::iostate rdstate (void) { return flags; }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1288
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1289 void setstate (std::ios_base::iostate m) { flags = flags \| m; }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1290
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1291 void clear (std::ios_base::iostate m
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1292 = (std::ios_base::eofbit & ~std::ios_base::eofbit))
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1293 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1294 flags = flags & m;
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1295 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1296
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1297 // Report if any characters have been consumed.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1298 // (get, read, etc. not cancelled by putback or seekg)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1299
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1300 void progress_benchmark (void) { progress_marker = idx; }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1301
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1302 bool no_progress (void) { return progress_marker == idx; }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1303
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1304 private:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1305
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1306 // Number of characters to read from the file at once.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1307 int bufsize;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1308
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1309 // Stream to read from.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1310 std::istream& i_stream;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1311
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1312 // Temporary storage for a "chunk" of data.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1313 char *buf;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1314
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1315 // Current read pointer.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1316 char *idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1317
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1318 // Location of last delimiter in the buffer at buf (undefined if
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1319 // delimited is false).
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1320 char *last;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1321
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1322 // Position after last character in buffer.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1323 char *eob;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1324
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1325 // True if there is delimiter in the bufer after idx.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1326 bool delimited;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1327
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1328 // Longest lookahead required.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1329 int longest;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1330
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1331 // Sequence of single-character delimiters.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1332 const std::string delims;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1333
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1334 // Position of start of buf in original stream.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1335 std::streampos buf_in_file;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1336
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1337 // Marker to see if a read consumes any characters.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1338 char *progress_marker;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1339
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1340 std::ios_base::iostate flags;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1341
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1342 // No copying!
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1343
22865 89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1344 delimited_stream (const delimited_stream&) = delete;
89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1345
89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1346 delimited_stream& operator = (const delimited_stream&) = delete;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1347 };
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1348
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1349 // Create a delimited stream, reading from is, with delimiters delims,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1350 // and allowing reading of up to tellg + longest_lookeahead. When is
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1351 // is at EOF, lookahead may be padded by ASCII nuls.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1352
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1353 delimited_stream::delimited_stream (std::istream& is,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1354 const std::string& delimiters,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1355 int longest_lookahead,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1356 octave_idx_type bsize)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1357 : bufsize (bsize), i_stream (is), longest (longest_lookahead),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1358 delims (delimiters),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1359 flags (std::ios::failbit & ~std::ios::failbit) // can't cast 0
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1360 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1361 buf = new char[bufsize];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1362 eob = buf + bufsize;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1363 idx = eob; // refresh_buf shouldn't try to copy old data
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1364 progress_marker = idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1365 refresh_buf (); // load the first batch of data
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1366 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1367
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1368 // Used to create a stream from a strstream from data read from a dstr.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1369 // FIXME: Find a more efficient approach. Perhaps derived dstr
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1370 delimited_stream::delimited_stream (std::istream& is,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1371 const delimited_stream& ds)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1372 : bufsize (ds.bufsize), i_stream (is), longest (ds.longest),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1373 delims (ds.delims),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1374 flags (std::ios::failbit & ~std::ios::failbit) // can't cast 0
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1375 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1376 buf = new char[bufsize];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1377 eob = buf + bufsize;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1378 idx = eob; // refresh_buf shouldn't try to copy old data
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1379 progress_marker = idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1380 refresh_buf (); // load the first batch of data
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1381 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1382
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1383 delimited_stream::~delimited_stream (void)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1384 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1385 // Seek to the correct position in i_stream.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1386 if (! eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1387 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1388 i_stream.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1389 i_stream.seekg (buf_in_file);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1390 i_stream.read (buf, idx - buf);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1391 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1392
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1393 delete [] buf;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1394 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1395
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1396 // Read a character from the buffer, refilling the buffer from the file
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1397 // if necessary.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1398
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1399 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1400 delimited_stream::get_undelim (void)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1401 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1402 int retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1403 if (eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1404 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1405 setstate (std::ios_base::failbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1406 return std::istream::traits_type::eof ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1407 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1408
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1409 if (idx < eob)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1410 retval = *idx++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1411 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1412 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1413 refresh_buf ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1414
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1415 if (eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1416 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1417 setstate (std::ios_base::eofbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1418 retval = std::istream::traits_type::eof ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1419 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1420 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1421 retval = *idx++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1422 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1423
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1424 if (idx >= last)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1425 delimited = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1426
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1427 return retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1428 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1429
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1430 // Return the next character to be read without incrementing the
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1431 // pointer, refilling the buffer from the file if necessary.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1432
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1433 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1434 delimited_stream::peek_undelim (void)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1435 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1436 int retval = get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1437 putback ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1438
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1439 return retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1440 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1441
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1442 // Copy remaining unprocessed data to the start of the buffer and load
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1443 // new data to fill it. Return EOF if the file is at EOF before
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1444 // reading any data and all of the data that has been read has been
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1445 // processed.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1446
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1447 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1448 delimited_stream::refresh_buf (void)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1449 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1450 if (eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1451 return std::istream::traits_type::eof ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1452
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1453 int retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1454
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1455 if (eob < idx)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1456 idx = eob;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1457
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1458 size_t old_remaining = eob - idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1459
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1460 octave_quit (); // allow ctrl-C
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1461
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1462 if (old_remaining > 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1463 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1464 buf_in_file += (idx - buf);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1465 memmove (buf, idx, old_remaining);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1466 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1467
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1468 progress_marker -= idx - buf; // where original idx would have been
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1469 idx = buf;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1470
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1471 int gcount; // chars read
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1472 if (! i_stream.eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1473 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1474 buf_in_file = i_stream.tellg (); // record for destructor
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1475 i_stream.read (buf + old_remaining, bufsize - old_remaining);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1476 gcount = i_stream.gcount ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1477 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1478 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1479 gcount = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1480
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1481 eob = buf + old_remaining + gcount;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1482 last = eob;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1483 if (gcount == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1484 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1485 delimited = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1486
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1487 if (eob != buf) // no more data in file, but still some to go
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1488 retval = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1489 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1490 // file and buffer are both done.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1491 retval = std::istream::traits_type::eof ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1492 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1493 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1494 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1495 delimited = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1496
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1497 for (last = eob - longest; last - buf >= 0; last--)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1498 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1499 if (delims.find (*last) != std::string::npos)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1500 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1501 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1502
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1503 if (last < buf)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1504 delimited = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1505
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1506 retval = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1507 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1508
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1509 // Ensure fast peek doesn't give valid char
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1510 if (retval == std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1511 *idx = '\0'; // FIXME: check that no TreatAsEmpty etc starts w. \0?
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1512
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1513 return retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1514 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1515
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1516 // Return a pointer to a block of data of size size, assuming that a
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1517 // sufficiently large buffer is available in buffer, if required.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1518 // If called when delimited == true, and size is no greater than
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1519 // longest_lookahead then this will not call refresh_buf, so seekg
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1520 // still works. Otherwise, seekg may be invalidated.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1521
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1522 char *
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1523 delimited_stream::read (char buffer, int size, char &prior_tell)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1524 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1525 char *retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1526
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1527 if (eob - idx > size)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1528 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1529 retval = idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1530 idx += size;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1531 if (idx > last)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1532 delimited = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1533 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1534 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1535 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1536 // If there was a tellg pointing to an earlier point than the current
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1537 // read position, try to keep it in the active buffer.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1538 // In the current code, prior_tell==idx for each call,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1539 // so this is not necessary, just a precaution.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1540
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1541 if (eob - prior_tell + size < bufsize)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1542 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1543 octave_idx_type gap = idx - prior_tell;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1544 idx = prior_tell;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1545 refresh_buf ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1546 idx += gap;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1547 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1548 else // can't keep the tellg in range. May skip some data.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1549 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1550 refresh_buf ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1551 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1552
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1553 prior_tell = buf;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1554
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1555 if (eob - idx > size)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1556 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1557 retval = idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1558 idx += size;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1559 if (idx > last)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1560 delimited = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1561 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1562 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1563 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1564 if (size <= bufsize) // small read, but reached EOF
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1565 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1566 retval = idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1567 memset (eob, 0, size + (idx - buf));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1568 idx += size;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1569 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1570 else // Reading more than the whole buf; return it in buffer
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1571 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1572 retval = buffer;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1573 // FIXME: read bufsize at a time
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1574 int i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1575 for (i = 0; i < size && ! eof (); i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1576 *buffer++ = get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1577 if (eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1578 memset (buffer, 0, size - i);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1579 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1580 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1581 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1582
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1583 return retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1584 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1585
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1586 // Return in OUT an entire line, terminated by delim. On input, OUT
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1587 // must have length at least 1.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1588
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1589 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1590 delimited_stream::getline (std::string& out, char delim)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1591 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1592 int len = out.length (), used = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1593 int ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1594 while ((ch = get_undelim ()) != delim
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1595 && ch != std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1596 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1597 out[used++] = ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1598 if (used == len)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1599 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1600 len <<= 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1601 out.resize (len);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1602 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1603 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1604 out.resize (used);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1605 field_done ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1606
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1607 return ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1608 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1609
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1610 // A single conversion specifier, such as %f or %c.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1611
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1612 class
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1613 textscan_format_elt
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1614 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1615 public:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1616
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1617 enum special_conversion
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1618 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1619 whitespace_conversion = 1,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1620 literal_conversion = 2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1621 };
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1622
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1623 textscan_format_elt (const std::string& txt, int w = 0, int p = -1,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1624 int bw = 0, bool dis = false, char typ = '\0',
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1625 const std::string& ch_class = std::string ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1626 : text (txt), width (w), prec (p), bitwidth (bw),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1627 char_class (ch_class), type (typ), discard (dis),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1628 numeric (typ == 'd' \|\| typ == 'u' \|\| type == 'f' \|\| type == 'n')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1629 { }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1630
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1631 textscan_format_elt (const textscan_format_elt& e)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1632 : text (e.text), width (e.width), prec (e.prec),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1633 bitwidth (e.bitwidth), char_class (e.char_class), type (e.type),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1634 discard (e.discard), numeric (e.numeric)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1635 { }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1636
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1637 textscan_format_elt& operator = (const textscan_format_elt& e)
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1638 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1639 if (this != &e)
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1640 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1641 text = e.text;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1642 width = e.width;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1643 prec = e.prec;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1644 bitwidth = e.bitwidth;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1645 discard = e.discard;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1646 type = e.type;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1647 numeric = e.numeric;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1648 char_class = e.char_class;
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1649 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1650
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1651 return *this;
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1652 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1653
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1654 // The C-style format string.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1655 std::string text;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1656
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1657 // The maximum field width.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1658 unsigned int width;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1659
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1660 // The maximum number of digits to read after the decimal in a
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1661 // floating point conversion.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1662 int prec;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1663
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1664 // The size of the result. For integers, bitwidth may be 8, 16, 34,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1665 // or 64. For floating point values, bitwidth may be 32 or 64.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1666 int bitwidth;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1667
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1668 // The class of characters in a `[' or `^' format.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1669 std::string char_class;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1670
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1671 // Type of conversion
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1672 // -- `d', `u', `f', `n', `s', `q', `c', `%', `C', `D', `[' or `^'.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1673 char type;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1674
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1675 // TRUE if we are not storing the result of this conversion.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1676 bool discard;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1677
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1678 // TRUE if the type is 'd', 'u', 'f', 'n'
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1679 bool numeric;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1680 };
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1681
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1682 // The (parsed) sequence of format specifiers.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1683
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1684 class textscan;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1685
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1686 class
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1687 textscan_format_list
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1688 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1689 public:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1690
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1691 textscan_format_list (const std::string& fmt = std::string (),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1692 const std::string& who = "textscan");
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1693
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1694 ~textscan_format_list (void);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1695
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1696 octave_idx_type num_conversions (void) const { return nconv; }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1697
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1698 // The length can be different than the number of conversions.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1699 // For example, "x %d y %d z" has 2 conversions but the length of
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1700 // the list is 3 because of the characters that appear after the
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1701 // last conversion.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1702
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1703 size_t numel (void) const { return fmt_elts.size (); }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1704
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1705 const textscan_format_elt *first (void)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1706 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1707 curr_idx = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1708 return current ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1709 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1710
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1711 const textscan_format_elt *current (void) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1712 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1713 return numel () > 0 ? fmt_elts[curr_idx] : 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1714 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1715
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1716 const textscan_format_elt *next (bool cycle = true)
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1717 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1718 curr_idx++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1719
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1720 if (curr_idx >= numel ())
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	1721 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1722 if (cycle)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1723 curr_idx = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1724 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1725 return 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1726 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1727
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1728 return current ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1729 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1730
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1731 void printme (void) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1732
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1733 bool ok (void) const { return (nconv >= 0); }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1734
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1735 operator const void* (void) const { return ok () ? this : 0; }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1736
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1737 // What function name should be shown when reporting errors.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1738 std::string who;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1739
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1740 // True if number of %f to be set from data file.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1741 bool set_from_first;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1742
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1743 // At least one conversion specifier is s,q,c, or [...].
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1744 bool has_string;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1745
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1746 int read_first_row (delimited_stream& is, textscan& ts);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1747
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1748 std::list<octave_value> out_buf (void) const { return (output_container); }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1749
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1750 private:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1751
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1752 // Number of conversions specified by this format string, or -1 if
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1753 // invalid conversions have been found.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1754 octave_idx_type nconv;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1755
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1756 // Index to current element;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1757 size_t curr_idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1758
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1759 // List of format elements.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1760 std::deque<textscan_format_elt*> fmt_elts;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1761
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1762 // list holding column arrays of types specified by conversions
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1763 std::list<octave_value> output_container;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1764
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1765 // Temporary buffer.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1766 std::ostringstream buf;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1767
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1768 void add_elt_to_list (unsigned int width, int prec, int bitwidth,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1769 octave_value val_type, bool discard,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1770 char type,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1771 const std::string& char_class = std::string ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1772
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1773 void process_conversion (const std::string& s, size_t& i, size_t n);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1774
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1775 std::string parse_char_class (const std::string& pattern) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1776
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1777 int finish_conversion (const std::string& s, size_t& i, size_t n,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1778 unsigned int& width, int& prec, int& bitwidth,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1779 octave_value& val_type,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1780 bool discard, char& type);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1781 // No copying!
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1782
22865 89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1783 textscan_format_list (const textscan_format_list&) = delete;
89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1784
89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1785 textscan_format_list& operator = (const textscan_format_list&) = delete;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1786 };
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1787
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1788 // Main class to implement textscan. Read data and parse it
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1789 // according to a format.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1790 //
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1791 // The calling sequence is
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1792 //
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1793 // textscan scanner ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1794 // scanner.scan (...);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1795
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1796 class
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1797 OCTINTERP_API
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1798 textscan
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1799 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1800 public:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1801
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1802 textscan (const std::string& who_arg = "textscan");
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1803
22868 87e3163f6c87 use c++11 "= default" syntax for declaration of trivial destructors John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	1804 ~textscan (void) = default;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1805
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1806 octave_value scan (std::istream& isp, const std::string& fmt,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1807 octave_idx_type ntimes,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1808 const octave_value_list& options,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1809 octave_idx_type& read_count);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1810
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1811 private:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1812
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1813 friend class textscan_format_list;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1814
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1815 // What function name should be shown when reporting errors.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1816 std::string who;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1817
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1818 std::string buf;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1819
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1820 // Three cases for delim_table and delim_list
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1821 // 1. delim_table empty, delim_list empty: whitespace delimiters
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1822 // 2. delim_table = look-up table of delim chars, delim_list empty.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1823 // 3. delim_table non-empty, delim_list = Cell array of delim strings
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1824
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1825 std::string whitespace_table;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1826
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1827 // delim_table[i] == '\0' if i is not a delimiter.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1828 std::string delim_table;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1829
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1830 // String of delimiter characters.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1831 std::string delims;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1832
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1833 Cell comment_style;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1834
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1835 // How far ahead to look to detect an open comment.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1836 int comment_len;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1837
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1838 // First character of open comment.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1839 int comment_char;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1840
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1841 octave_idx_type buffer_size;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1842
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1843 std::string date_locale;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1844
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1845 // 'inf' and 'nan' for formatted_double.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1846 Cell inf_nan;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1847
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1848 // Array of strings of delimiters.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1849 Cell delim_list;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1850
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1851 // Longest delimiter.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1852 int delim_len;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1853
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1854 octave_value empty_value;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1855 std::string exp_chars;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1856 int header_lines;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1857 Cell treat_as_empty;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1858
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1859 // Longest string to treat as "N/A".
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1860 int treat_as_empty_len;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1861
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1862 std::string whitespace;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1863
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1864 short eol1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1865 short eol2;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1866 short return_on_error;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1867
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1868 bool collect_output;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1869 bool multiple_delims_as_one;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1870 bool default_exp;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1871 bool numeric_delim;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1872
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1873 octave_idx_type lines;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1874
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1875 octave_value do_scan (std::istream& isp, textscan_format_list& fmt_list,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1876 octave_idx_type ntimes);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1877
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1878 void parse_options (const octave_value_list& args,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1879 textscan_format_list& fmt_list);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1880
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1881 int read_format_once (delimited_stream& isp, textscan_format_list& fmt_list,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1882 std::list<octave_value>& retval,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1883 Array<octave_idx_type> row, int& done_after);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1884
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1885 void scan_one (delimited_stream& is, const textscan_format_elt& fmt,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1886 octave_value& ov, Array<octave_idx_type> row);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1887
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1888 // Methods to process a particular conversion specifier.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1889 double read_double (delimited_stream& is,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1890 const textscan_format_elt& fmt) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1891
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1892 void scan_complex (delimited_stream& is, const textscan_format_elt& fmt,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1893 Complex& val) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1894
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1895 int scan_bracket (delimited_stream& is, const std::string& pattern,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1896 std::string& val) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1897
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1898 int scan_caret (delimited_stream& is, const std::string& pattern,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1899 std::string& val) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1900
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1901 void scan_string (delimited_stream& is, const textscan_format_elt& fmt,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1902 std::string& val) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1903
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1904 void scan_cstring (delimited_stream& is, const textscan_format_elt& fmt,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1905 std::string& val) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1906
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1907 void scan_qstring (delimited_stream& is, const textscan_format_elt& fmt,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1908 std::string& val);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1909
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1910 // Helper methods.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1911 std::string read_until (delimited_stream& is, const Cell& delimiters,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1912 const std::string& ends) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1913
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1914 int lookahead (delimited_stream& is, const Cell& targets, int max_len,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1915 bool case_sensitive = true) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1916
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1917 bool match_literal (delimited_stream& isp, const textscan_format_elt& elem);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1918
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1919 int skip_whitespace (delimited_stream& is, bool EOLstop = false);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1920
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1921 int skip_delim (delimited_stream& is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1922
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1923 bool is_delim (unsigned char ch) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1924 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1925 return ((delim_table.empty () && (isspace (ch) \|\| ch == eol1 \|\| ch == eol2))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1926 \|\| delim_table[ch] != '\0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1927 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1928
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1929 bool isspace (unsigned int ch) const { return whitespace_table[ch & 0xff]; }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1930
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1931 // True if the only delimiter is whitespace.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1932 bool whitespace_delim (void) const { return delim_table.empty (); }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1933
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1934 // No copying!
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1935
22865 89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1936 textscan (const textscan&) = delete;
89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1937
89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1938 textscan& operator = (const textscan&) = delete;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1939 };
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1940
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1941 textscan_format_list::textscan_format_list (const std::string& s,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1942 const std::string& who_arg)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1943 : who (who_arg), set_from_first (false), has_string (false),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1944 nconv (0), curr_idx (0), fmt_elts (), buf ()
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1945 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1946 size_t n = s.length ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1947
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1948 size_t i = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1949
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1950 unsigned int width = -1; // Unspecified width = max (except %c)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1951 int prec = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1952 int bitwidth = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1953 bool discard = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1954 char type = '\0';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1955
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1956 bool have_more = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1957
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1958 if (s.empty ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1959 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1960 buf.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1961 buf.str ("");
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1962
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1963 buf << "%f";
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1964
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1965 bitwidth = 64;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1966 type = 'f';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1967 add_elt_to_list (width, prec, bitwidth, octave_value (NDArray ()),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1968 discard, type);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1969 have_more = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1970 set_from_first = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1971 nconv = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1972 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1973 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1974 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1975 set_from_first = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1976
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1977 while (i < n)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1978 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1979 have_more = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1980
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1981 if (s[i] == '%' && (i+1 == n \|\| s[i+1] != '%'))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1982 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1983 // Process percent-escape conversion type.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1984
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1985 process_conversion (s, i, n);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1986
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1987 // If there is nothing in the buffer, then add_elt_to_list
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1988 // must have just been called, so we are already done with
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1989 // the current element and we don't need to call
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1990 // add_elt_to_list if this is our last trip through the
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1991 // loop.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1992
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1993 have_more = (buf.tellp () != 0);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1994 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1995 else if (isspace (s[i]))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1996 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1997 while (++i < n && isspace (s[i]))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1998 /* skip whitespace */;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1999
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2000 have_more = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2001 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2002 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2003 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2004 type = textscan_format_elt::literal_conversion;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2005
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2006 width = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2007 prec = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2008 bitwidth = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2009 discard = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2010
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2011 while (i < n && ! isspace (s[i])
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2012 && (s[i] != '%' \|\| (i+1 < n && s[i+1] == '%')))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2013 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2014 if (s[i] == '%') // if double %, skip one
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2015 i++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2016 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2017 width++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2018 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2019
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2020 add_elt_to_list (width, prec, bitwidth, octave_value (),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2021 discard, type);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2022
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2023 have_more = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2024 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2025
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2026 if (nconv < 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2027 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2028 have_more = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2029 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2030 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2031 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2032 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2033
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2034 if (have_more)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2035 add_elt_to_list (width, prec, bitwidth, octave_value (), discard, type);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2036
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2037 buf.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2038 buf.str ("");
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2039 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2040
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2041 textscan_format_list::~textscan_format_list (void)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2042 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2043 size_t n = numel ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2044
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2045 for (size_t i = 0; i < n; i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2046 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2047 textscan_format_elt *elt = fmt_elts[i];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2048 delete elt;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2049 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2050 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2051
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2052 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2053 textscan_format_list::add_elt_to_list (unsigned int width, int prec,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2054 int bitwidth, octave_value val_type,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2055 bool discard, char type,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2056 const std::string& char_class)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2057 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2058 std::string text = buf.str ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2059
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2060 if (! text.empty ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2061 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2062 textscan_format_elt *elt
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	2063 = new textscan_format_elt (text, width, prec, bitwidth, discard, type,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	2064 char_class);
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2065
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2066 if (! discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2067 output_container.push_back (val_type);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2068
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2069 fmt_elts.push_back (elt);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2070 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2071
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2072 buf.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2073 buf.str ("");
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2074 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2075
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2076 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2077 textscan_format_list::process_conversion (const std::string& s, size_t& i,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2078 size_t n)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2079 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2080 unsigned width = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2081 int prec = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2082 int bitwidth = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2083 bool discard = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2084 octave_value val_type;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2085 char type = '\0';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2086
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2087 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2088
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2089 bool have_width = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2090
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2091 while (i < n)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2092 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2093 switch (s[i])
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2094 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2095 case '*':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2096 if (discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2097 nconv = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2098 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2099 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2100 discard = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2101 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2102 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2103 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2104
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2105 case '0': case '1': case '2': case '3': case '4':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2106 case '5': case '6': case '7': case '8': case '9':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2107 if (have_width)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2108 nconv = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2109 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2110 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2111 char c = s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2112 width = width * 10 + c - '0';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2113 have_width = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2114 buf << c;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2115 while (i < n && isdigit (s[i]))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2116 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2117 c = s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2118 width = width * 10 + c - '0';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2119 buf << c;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2120 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2121
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2122 if (i < n && s[i] == '.')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2123 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2124 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2125 prec = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2126 while (i < n && isdigit (s[i]))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2127 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2128 c = s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2129 prec = prec * 10 + c - '0';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2130 buf << c;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2131 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2132 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2133 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2134 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2135
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2136 case 'd': case 'u':
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2137 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2138 bool done = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2139 buf << (type = s[i++]);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2140 if (i < n)
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2141 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2142 if (s[i] == '8')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2143 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2144 bitwidth = 8;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2145 if (type == 'd')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2146 val_type = octave_value (int8NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2147 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2148 val_type = octave_value (uint8NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2149 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2150 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2151 else if (s[i] == '1' && i+1 < n && s[i+1] == '6')
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2152 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2153 bitwidth = 16;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2154 if (type == 'd')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2155 val_type = octave_value (int16NDArray ());
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2156 else
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2157 val_type = octave_value (uint16NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2158 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2159 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2160 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2161 else if (s[i] == '3' && i+1 < n && s[i+1] == '2')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2162 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2163 done = false; // use default size below
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2164 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2165 buf << s[i++];
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2166 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2167 else if (s[i] == '6' && i+1 < n && s[i+1] == '4')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2168 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2169 bitwidth = 64;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2170 if (type == 'd')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2171 val_type = octave_value (int64NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2172 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2173 val_type = octave_value (uint64NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2174 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2175 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2176 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2177 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2178 done = false;
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2179 }
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2180 else
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2181 done = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2182
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2183 if (! done)
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2184 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2185 bitwidth = 32;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2186 if (type == 'd')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2187 val_type = octave_value (int32NDArray ());
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2188 else
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2189 val_type = octave_value (uint32NDArray ());
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2190 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2191 goto fini;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2192 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2193
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2194 case 'f':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2195 buf << (type = s[i++]);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2196 bitwidth = 64;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2197 if (i < n)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2198 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2199 if (s[i] == '3' && i+1 < n && s[i+1] == '2')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2200 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2201 bitwidth = 32;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2202 val_type = octave_value (FloatNDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2203 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2204 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2205 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2206 else if (s[i] == '6' && i+1 < n && s[i+1] == '4')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2207 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2208 val_type = octave_value (NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2209 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2210 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2211 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2212 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2213 val_type = octave_value (NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2214 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2215 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2216 val_type = octave_value (NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2217 goto fini;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2218
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2219 case 'n':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2220 buf << (type = s[i++]);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2221 bitwidth = 64;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2222 val_type = octave_value (NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2223 goto fini;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2224
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2225 case 's': case 'q': case '[': case 'c':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2226 if (! discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2227 val_type = octave_value (Cell ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2228 buf << (type = s[i++]);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2229 has_string = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2230 goto fini;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2231
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2232 fini:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2233 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2234 if (! have_width)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2235 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2236 if (type == 'c') // %c defaults to one character
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2237 width = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2238 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2239 width = static_cast<unsigned int> (-1); // others: unlimited
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2240 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2241
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2242 if (finish_conversion (s, i, n, width, prec, bitwidth, val_type,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2243 discard, type) == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2244 return;
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2245 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2246 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2247
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2248 default:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2249 error ("%s: '%%%c' is not a valid format specifier",
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2250 who.c_str (), s[i]);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2251 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2252
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2253 if (nconv < 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2254 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2255 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2256
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2257 nconv = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2258 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2259
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2260 // Parse [...] and [^...]
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2261 //
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2262 // Matlab does not expand expressions like A-Z, but they are useful, and
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2263 // so we parse them "carefully". We treat '-' as a usual character
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2264 // unless both start and end characters are from the same class (upper
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2265 // case, lower case, numeric), or this is not the first '-' in the
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2266 // pattern.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2267 //
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2268 // Keep both a running list of characters and a mask of which chars have
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2269 // occurred. The first is efficient for patterns with few characters.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2270 // The latter is efficient for [^...] patterns.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2271
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2272 std::string
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2273 textscan_format_list::parse_char_class (const std::string& pattern) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2274 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2275 int len = pattern.length ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2276 if (len == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2277 return "";
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2278
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2279 std::string retval (256, '\0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2280 std::string mask (256, '\0'); // number of times chr has been seen
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2281
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2282 int in = 0, out = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2283 unsigned char ch, prev = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2284 bool flip = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2285
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2286 ch = pattern[in];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2287 if (ch == '^')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2288 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2289 in++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2290 flip = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2291 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2292 mask[pattern[in]] = '\1';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2293 retval[out++] = pattern[in++]; // even copy ']' if it is first
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2294
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2295 bool prev_was_range = false; // disallow "a-m-z" as a pattern
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2296 bool prev_prev_was_range = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2297 for (; in < len; in++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2298 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2299 bool was_range = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2300 ch = pattern[in];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2301 if (ch == ']')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2302 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2303
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2304 if (prev == '-' && in > 1 && isalnum (ch) && ! prev_prev_was_range)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2305 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2306 unsigned char start_of_range = pattern[in-2];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2307 if (start_of_range < ch
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2308 && ((isupper (ch) && isupper (start_of_range))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2309 \|\| (islower (ch) && islower (start_of_range))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2310 \|\| (isdigit (ch) && isdigit (start_of_range))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2311 \|\| mask['-'] > 1)) // not the first '-'
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2312 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2313 was_range = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2314 out--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2315 mask['-']--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2316 for (int i = start_of_range; i <= ch; i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2317 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2318 if (mask[i] == '\0')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2319 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2320 mask[i] = '\1';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2321 retval[out++] = i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2322 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2323 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2324 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2325 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2326 if (! was_range)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2327 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2328 if (mask[ch]++ == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2329 retval[out++] = ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2330 else if (ch != '-')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2331 warning_with_id ("octave:textscan-pattern",
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2332 "%s: [...] contains two '%c's",
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2333 who.c_str (), ch);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2334
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2335 if (prev == '-' && mask['-'] >= 2)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2336 warning_with_id
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2337 ("octave:textscan-pattern",
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2338 "%s: [...] contains two '-'s outside range expressions",
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2339 who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2340 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2341 prev = ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2342 prev_prev_was_range = prev_was_range;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2343 prev_was_range = was_range;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2344 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2345
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2346 if (flip) // [^...]
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2347 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2348 out = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2349 for (int i = 0; i < 256; i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2350 if (! mask[i])
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2351 retval[out++] = i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2352 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2353
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2354 retval.resize (out);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2355
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2356 return retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2357 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2358
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2359 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2360 textscan_format_list::finish_conversion (const std::string& s, size_t& i,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2361 size_t n, unsigned int& width,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2362 int& prec, int& bitwidth,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2363 octave_value& val_type, bool discard,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2364 char& type)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2365 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2366 int retval = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2367
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2368 std::string char_class;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2369
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2370 size_t beg_idx = std::string::npos;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2371 size_t end_idx = std::string::npos;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2372
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2373 if (type != '%')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2374 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2375 nconv++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2376 if (type == '[')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2377 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2378 if (i < n)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2379 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2380 beg_idx = i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2381
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2382 if (s[i] == '^')
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2383 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2384 type = '^';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2385 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2386
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2387 if (i < n)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2388 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2389 beg_idx = i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2390
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2391 if (s[i] == ']')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2392 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2393 }
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2394 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2395 else if (s[i] == ']')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2396 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2397 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2398
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2399 while (i < n && s[i] != ']')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2400 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2401
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2402 if (i < n && s[i] == ']')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2403 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2404 end_idx = i-1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2405 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2406 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2407
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2408 if (s[i-1] != ']')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2409 retval = nconv = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2410 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2411 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2412
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2413 if (nconv >= 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2414 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2415 if (beg_idx != std::string::npos && end_idx != std::string::npos)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2416 char_class = parse_char_class (s.substr (beg_idx,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2417 end_idx - beg_idx + 1));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2418
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2419 add_elt_to_list (width, prec, bitwidth, val_type, discard, type,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2420 char_class);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2421 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2422
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2423 return retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2424 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2425
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2426 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2427 textscan_format_list::printme (void) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2428 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2429 size_t n = numel ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2430
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2431 for (size_t i = 0; i < n; i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2432 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2433 textscan_format_elt *elt = fmt_elts[i];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2434
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2435 std::cerr
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2436 << "width: " << elt->width << "\n"
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2437 << "digits " << elt->prec << "\n"
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2438 << "bitwidth: " << elt->bitwidth << "\n"
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2439 << "discard: " << elt->discard << "\n"
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2440 << "type: ";
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2441
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2442 if (elt->type == textscan_format_elt::literal_conversion)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2443 std::cerr << "literal text\n";
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2444 else if (elt->type == textscan_format_elt::whitespace_conversion)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2445 std::cerr << "whitespace\n";
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2446 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2447 std::cerr << elt->type << "\n";
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2448
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2449 std::cerr
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2450 << "char_class: `" << undo_string_escapes (elt->char_class) << "'\n"
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2451 << "text: `" << undo_string_escapes (elt->text) << "'\n\n";
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2452 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2453 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2454
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2455 // If FORMAT is explicitly "", it is assumed to be "%f" repeated enough
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2456 // times to read the first row of the file. Set it now.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2457
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2458 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2459 textscan_format_list::read_first_row (delimited_stream& is, textscan& ts)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2460 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2461 // Read first line and strip end-of-line, which may be two characters
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2462 std::string first_line (20, ' ');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2463
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2464 is.getline (first_line, static_cast<char> (ts.eol2));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2465
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2466 if (! first_line.empty ()
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2467 && first_line[first_line.length () - 1] == ts.eol1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2468 first_line.resize (first_line.length () - 1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2469
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2470 std::istringstream strstr (first_line);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2471 delimited_stream ds (strstr, is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2472
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2473 dim_vector dv (1,1); // initial size of each output_container
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2474 Complex val;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2475 octave_value val_type;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2476 nconv = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2477 int max_empty = 1000; // failsafe, if ds fails but not with eof
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2478 int retval = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2479
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2480 // read line, creating output_container as we go
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2481 while (! ds.eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2482 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2483 bool already_skipped_delim = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2484 ts.skip_whitespace (ds);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2485 ds.progress_benchmark ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2486 bool progress = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2487 ts.scan_complex (ds, *fmt_elts[0], val);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2488 if (ds.fail ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2489 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2490 ds.clear (ds.rdstate () & ~std::ios::failbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2491
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2492 if (ds.eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2493 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2494
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2495 // Unless this was a missing value (i.e., followed by a delimiter),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2496 // return with an error status.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2497 ts.skip_delim (ds);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2498 if (ds.no_progress ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2499 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2500 retval = 4;
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2501 break;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2502 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2503 already_skipped_delim = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2504
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2505 val = ts.empty_value.scalar_value ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2506
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2507 if (! --max_empty)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2508 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2509 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2510
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2511 if (val.imag () == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2512 val_type = octave_value (NDArray (dv, val.real ()));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2513 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2514 val_type = octave_value (ComplexNDArray (dv, val));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2515
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2516 output_container.push_back (val_type);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2517
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2518 if (! already_skipped_delim)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2519 ts.skip_delim (ds);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2520
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2521 if (! progress && ds.no_progress ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2522 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2523
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2524 nconv++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2525 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2526
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2527 output_container.pop_front (); // discard empty element from constructor
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2528
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2529 // Create fmt_list now that the size is known
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2530 for (octave_idx_type i = 1; i < nconv; i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2531 fmt_elts.push_back (new textscan_format_elt (*fmt_elts[0]));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2532
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2533 return retval; // May have returned 4 above.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2534 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2535
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2536 textscan::textscan (const std::string& who_arg)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2537 : who (who_arg), buf (), whitespace_table (), delim_table (),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2538 delims (), comment_style (), comment_len (0), comment_char (-2),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2539 buffer_size (0), date_locale (), inf_nan (init_inf_nan ()),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2540 empty_value (octave::numeric_limits<double>::NaN ()), exp_chars ("edED"),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2541 header_lines (0), treat_as_empty (), treat_as_empty_len (0),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2542 whitespace (" \b\t"), eol1 ('\r'), eol2 ('\n'),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2543 return_on_error (1), collect_output (false),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2544 multiple_delims_as_one (false), default_exp (true),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2545 numeric_delim (false), lines (0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2546 { }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2547
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2548 octave_value
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2549 textscan::scan (std::istream& isp, const std::string& fmt,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2550 octave_idx_type ntimes, const octave_value_list& options,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2551 octave_idx_type& count)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2552 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2553 textscan_format_list fmt_list (fmt);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2554
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2555 parse_options (options, fmt_list);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2556
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2557 octave_value result = do_scan (isp, fmt_list, ntimes);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2558
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2559 // FIXME: this is probably not the best way to get count. The
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2560 // position could easily be larger than octave_idx_type when using
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2561 // 32-bit indexing.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2562
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2563 std::ios::iostate state = isp.rdstate ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2564 isp.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2565 count = static_cast<octave_idx_type> (isp.tellg ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2566 isp.setstate (state);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2567
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2568 return result;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2569 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2570
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2571 octave_value
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2572 textscan::do_scan (std::istream& isp, textscan_format_list& fmt_list,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2573 octave_idx_type ntimes)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2574 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2575 octave_value retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2576
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2577 if (fmt_list.num_conversions () == -1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2578 error ("%s: invalid format specified", who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2579
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2580 if (fmt_list.num_conversions () == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2581 error ("%s: no valid format conversion specifiers", who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2582
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2583 // skip the first header_lines
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2584 std::string dummy;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2585 for (int i = 0; i < header_lines && isp; i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2586 getline (isp, dummy, static_cast<char> (eol2));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2587
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2588 // Create our own buffered stream, for fast get/putback/tell/seek.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2589
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2590 // First, see how far ahead it should let us look.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2591 int max_lookahead = std::max (std::max (comment_len, treat_as_empty_len),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2592 std::max (delim_len, 3)); // 3 for NaN and Inf
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2593
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2594 // Next, choose a buffer size to avoid reading too much, or too often.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2595 octave_idx_type buf_size = 4096;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2596 if (buffer_size)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2597 buf_size = buffer_size;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2598 else if (ntimes > 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2599 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2600 // Avoid overflow of 80*ntimes...
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2601 buf_size = std::min (buf_size, std::max (ntimes, 80 * ntimes));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2602 buf_size = std::max (buf_size, ntimes);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2603 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2604 // Finally, create the stream.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2605 delimited_stream is (isp,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2606 (delim_table.empty () ? whitespace + "\r\n" : delims),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2607 max_lookahead, buf_size);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2608
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2609 // Grow retval dynamically. "size" is half the initial size
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2610 // (FIXME: Should we start smaller if ntimes is large?)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2611 octave_idx_type size = ((ntimes < 8 && ntimes >= 0) ? ntimes : 1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2612 Array<octave_idx_type> row_idx (dim_vector (1,2));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2613 row_idx(1) = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2614
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2615 int err = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2616 octave_idx_type row = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2617
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2618 if (multiple_delims_as_one) // bug #44750?
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2619 skip_delim (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2620
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2621 int done_after; // Number of columns read when EOF seen.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2622
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2623 // If FORMAT explicitly "", read first line and see how many "%f" match
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2624 if (fmt_list.set_from_first)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2625 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2626 err = fmt_list.read_first_row (is, *this);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2627 lines = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2628
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2629 done_after = fmt_list.numel () + 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2630 if (! err)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2631 row = 1; // the above puts the first line into fmt_list.out_buf ()
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2632 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2633 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2634 done_after = fmt_list.out_buf ().size () + 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2635
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2636 std::list<octave_value> out = fmt_list.out_buf ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2637
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2638 // We will later merge adjacent columns of the same type.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2639 // Check now which columns to merge.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2640 // Reals may become complex, and so we can't trust types
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2641 // after reading in data.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2642 // If the format was "", that conversion may already have happened,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2643 // so force all to be merged (as all are %f).
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2644 bool merge_with_prev[fmt_list.numel ()];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2645 int conv = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2646 if (collect_output)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2647 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2648 int prev_type = -1;
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2649 for (const auto& col : out)
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2650 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2651 if (col.type_id () == prev_type
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2652 \|\| (fmt_list.set_from_first && prev_type != -1))
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2653 merge_with_prev[conv++] = true;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2654 else
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2655 merge_with_prev[conv++] = false;
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2656
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2657 prev_type = col.type_id ();
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2658 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2659 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2660
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2661 // This should be caught by earlier code, but this avoids a possible
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2662 // infinite loop below.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2663 if (fmt_list.num_conversions () == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2664 error ("%s: No conversions specified", who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2665
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2666 // Read the data. This is the main loop.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2667 if (! err)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2668 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2669 for (/* row set ~30 lines above */; row < ntimes \|\| ntimes == -1; row++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2670 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2671 if (row == 0 \|\| row >= size)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2672 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2673 size += size+1;
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2674 for (auto& col : out)
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2675 col = col.resize (dim_vector (size, 1), 0);
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2676 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2677
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2678 row_idx(0) = row;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2679 err = read_format_once (is, fmt_list, out, row_idx, done_after);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2680
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2681 if ((err & ~1) > 0 \|\| ! is \|\| (lines >= ntimes && ntimes > -1))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2682 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2683 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2684 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2685
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2686 if ((err & 4) && ! return_on_error)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2687 error ("%s: Read error in field %d of row %d", who.c_str (),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2688 done_after + 1, row + 1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2689
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2690 // If file does not end in EOL, do not pad columns with NaN.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2691 bool uneven_columns = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2692 if (err & 4)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2693 uneven_columns = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2694 else if (isp.eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2695 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2696 isp.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2697 isp.seekg (-1, std::ios_base::end);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2698 int last_char = isp.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2699 isp.setstate (isp.eofbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2700 uneven_columns = (last_char != eol1 && last_char != eol2);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2701 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2702
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2703 // convert return value to Cell array
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2704 Array<octave_idx_type> ra_idx (dim_vector (1,2));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2705
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2706 // (err & 1) means "error, and no columns read this row
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2707 // FIXME: This may redundant now that done_after=0 says the same
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2708 if (err & 1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2709 done_after = out.size () + 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2710
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2711 int valid_rows = (row == ntimes) ? ntimes
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	2712 : (((err & 1) && (err & 8)) ? row : row+1);
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2713 dim_vector dv (valid_rows, 1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2714
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2715 ra_idx(0) = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2716 int i = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2717 if (! collect_output)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2718 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2719 retval = Cell (dim_vector (1, out.size ()));
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2720 for (auto& col : out)
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2721 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2722 // trim last columns if that was requested
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2723 if (i == done_after && uneven_columns)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2724 dv = dim_vector (std::max (valid_rows - 1, 0), 1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2725
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2726 ra_idx(1) = i;
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2727 retval = do_cat_op (retval, octave_value (Cell (col.resize (dv,0))),
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2728 ra_idx);
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2729 i++;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2730 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2731 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2732 else // group adjacent cells of the same type into a single cell
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2733 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2734 octave_value cur; // current cell, accumulating columns
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2735 octave_idx_type group_size = 0; // columns in this cell
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2736 int prev_type = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2737
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2738 conv = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2739 retval = Cell ();
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2740 for (auto& col : out)
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2741 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2742 if (! merge_with_prev[conv++]) // including first time
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2743 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2744 if (prev_type != -1)
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2745 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2746 ra_idx(1) = i++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2747 retval = do_cat_op (retval, octave_value (Cell (cur)),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2748 ra_idx);
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2749 }
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2750 cur = octave_value (col.resize (dv,0));
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2751 group_size = 1;
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2752 prev_type = col.type_id ();
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2753 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2754 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2755 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2756 ra_idx(1) = group_size++;
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2757 cur = do_cat_op (cur, octave_value (col.resize (dv,0)),
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2758 ra_idx);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2759 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2760 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2761 ra_idx(1) = i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2762 retval = do_cat_op (retval, octave_value (Cell (cur)), ra_idx);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2763 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2764
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2765 return retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2766 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2767
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2768 // Read a double considering the "precision" field of FMT and the
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2769 // EXP_CHARS option of OPTIONS.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2770
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2771 double
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2772 textscan::read_double (delimited_stream& is,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2773 const textscan_format_elt& fmt) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2774 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2775 int sign = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2776 unsigned int width_left = fmt.width;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2777 double retval = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2778 bool valid = false; // syntactically correct double?
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2779
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2780 int ch = is.peek ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2781
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2782 if (ch == '+')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2783 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2784 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2785 ch = is.peek ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2786 if (width_left)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2787 width_left--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2788 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2789 else if (ch == '-')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2790 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2791 sign = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2792 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2793 ch = is.peek ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2794 if (width_left)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2795 width_left--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2796 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2797
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2798 // Read integer part
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2799 if (ch != '.')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2800 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2801 if (ch >= '0' && ch <= '9') // valid if at least one digit
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2802 valid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2803 while (width_left-- && is && (ch = is.get ()) >= '0' && ch <= '9')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2804 retval = retval * 10 + (ch - '0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2805 width_left++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2806 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2807
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2808 // Read fractional part, up to specified precision
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2809 if (ch == '.' && width_left)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2810 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2811 double multiplier = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2812 int precision = fmt.prec;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2813 int i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2814
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2815 if (width_left)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2816 width_left--; // Consider width of '.'
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2817
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2818 if (precision == -1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2819 precision = 1<<30; // FIXME: Should be MAXINT
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2820
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2821 if (! valid) // if there was nothing before '.'...
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2822 is.get (); // ...ch was a "peek", not "get".
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2823
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2824 for (i = 0; i < precision; i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2825 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2826 if (width_left-- && is && (ch = is.get ()) >= '0' && ch <= '9')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2827 retval += (ch - '0') * (multiplier *= 0.1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2828 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2829 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2830 width_left++;
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2831 break;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2832 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2833 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2834
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2835 // round up if we truncated and the next digit is >= 5
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2836 if ((i == precision \|\| ! width_left) && (ch = is.get ()) >= '5'
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2837 && ch <= '9')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2838 retval += multiplier;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2839
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2840 if (i > 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2841 valid = true; // valid if at least one digit after '.'
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2842
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2843 // skip remainder after '.', to field width, to look for exponent
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2844 if (i == precision)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2845 while (width_left-- && is && (ch = is.get ()) >= '0' && ch <= '9')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2846 ; // discard
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2847
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2848 width_left++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2849 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2850
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2851 // look for exponent part in, e.g., 6.023E+23
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2852 bool used_exp = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2853 if (valid && width_left > 1 && exp_chars.find (ch) != std::string::npos)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2854 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2855 int ch1 = is.peek ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2856 if (ch1 == '-' \|\| ch1 == '+' \|\| (ch1 >= '0' && ch1 <= '9'))
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	2857 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	2858 // if 1.0e+$ or some such, this will set failbit, as we want
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2859 width_left--; // count "E"
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2860 int exp = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2861 int exp_sign = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2862 if (ch1 == '+')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2863 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2864 if (width_left)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2865 width_left--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2866 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2867 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2868 else if (ch1 == '-')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2869 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2870 exp_sign = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2871 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2872 if (width_left)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2873 width_left--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2874 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2875 valid = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2876 while (width_left-- && is && (ch = is.get ()) >= '0' && ch <= '9')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2877 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2878 exp = exp*10 + ch - '0';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2879 valid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2880 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2881 width_left++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2882 if (ch != std::istream::traits_type::eof () && width_left)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2883 is.putback (ch);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2884
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2885 double multiplier = pown (10, exp);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2886 if (exp_sign > 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2887 retval *= multiplier;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2888 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2889 retval /= multiplier;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2890
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2891 used_exp = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2892 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2893 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2894 is.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2895 if (! used_exp && ch != std::istream::traits_type::eof () && width_left)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2896 is.putback (ch);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2897
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2898 // Check for +/- inf and NaN
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2899 if (! valid && width_left >= 3)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2900 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2901 int i = lookahead (is, inf_nan, 3, false); // false -> case insensitive
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2902 if (i == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2903 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2904 retval = octave::numeric_limits<double>::Inf ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2905 valid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2906 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2907 else if (i == 1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2908 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2909 retval = octave::numeric_limits<double>::NaN ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2910 valid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2911 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2912 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2913
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2914 // Check for +/- inf and NaN
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2915 if (! valid && width_left >= 3)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2916 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2917 int i = lookahead (is, inf_nan, 3, false); // false -> case insensitive
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2918 if (i == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2919 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2920 retval = octave::numeric_limits<double>::Inf ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2921 valid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2922 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2923 else if (i == 1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2924 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2925 retval = octave::numeric_limits<double>::NaN ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2926 valid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2927 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2928 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2929
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2930 if (! valid)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2931 is.setstate (std::ios::failbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2932 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2933 is.setstate (is.rdstate () & ~std::ios::failbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2934
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2935 return retval * sign;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2936 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2937
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2938 // Read a single number: real, complex, inf, NaN, possibly with limited
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2939 // precision. Calls to this should be preceded by skip_whitespace.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2940 // Calling that inside scan_complex would violate its const declaration.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2941
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2942 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2943 textscan::scan_complex (delimited_stream& is, const textscan_format_elt& fmt,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2944 Complex& val) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2945 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2946 double im = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2947 double re = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2948 bool as_empty = false; // did we fail but match a "treat_as_empty" string?
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2949 bool inf = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2950
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2951 int ch = is.peek ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2952 if (ch == '+' \|\| ch == '-') // check for [+-][ij] with no coefficients
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2953 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2954 ch = is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2955 int ch2 = is.peek ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2956 if (ch2 == 'i' \|\| ch2 == 'j')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2957 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2958 double value = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2959 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2960 // Check not -inf
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2961 if (is.peek () == 'n')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2962 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2963 char *pos = is.tellg ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2964 std::ios::iostate state = is.rdstate ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2965
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2966 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2967 ch2 = is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2968 if (ch2 == 'f')
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2969 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2970 inf = true;
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	2971 re = (ch == '+') ? octave::numeric_limits<double>::Inf ()
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	2972 : -octave::numeric_limits<double>::Inf ();
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2973 value = 0;
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2974 }
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2975 else
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	2976 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2977 is.clear (state);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2978 is.seekg (pos); // reset to position before look-ahead
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2979 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2980 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2981
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2982 im = (ch == '+') ? value : -value;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2983 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2984 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2985 is.putback (ch);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2986 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2987
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2988 if (! im && ! inf) // if not [+-][ij] or [+-]inf, read real normally
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2989 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2990 char *pos = is.tellg ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2991 std::ios::iostate state = is.rdstate ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2992 //re = octave_read_value<double> (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2993 re = read_double (is, fmt);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2994
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2995 // check for "treat as empty" string
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2996 if (treat_as_empty.numel ()
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2997 && (is.fail () \|\| octave::math::is_NaN_or_NA (Complex (re))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2998 \|\| re == octave::numeric_limits<double>::Inf ()))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2999 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3000
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3001 for (int i = 0; i < treat_as_empty.numel (); i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3002 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3003 if (ch == treat_as_empty (i).string_value ()[0])
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3004 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3005 as_empty = true; // first char matches, so read the lot
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3006 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3007 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3008 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3009 if (as_empty) // if first char matched...
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3010 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3011 as_empty = false; // ...look for the whole string
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3012
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3013 is.clear (state); // treat_as_empty "-" causes partial read
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3014 is.seekg (pos); // reset to position before failed read
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3015
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3016 // treat_as_empty strings may be different sizes.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3017 // Read ahead longest, put it all back, then re-read the string
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3018 // that matches.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3019 std::string look_buf (treat_as_empty_len, '\0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3020 char *look = is.read (&look_buf[0], look_buf.size (), pos);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3021
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3022 is.clear (state);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3023 is.seekg (pos); // reset to position before look-ahead
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3024 // FIXME: is.read could invalidate pos
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3025
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3026 for (int i = 0; i < treat_as_empty.numel (); i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3027 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3028 std::string s = treat_as_empty (i).string_value ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3029 if (! strncmp (s.c_str (), look, s.size ()))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3030 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3031 as_empty = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3032 // read just the right amount
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3033 is.read (&look_buf[0], s.size (), pos);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3034 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3035 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3036 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3037 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3038 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3039
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3040 if (! is.eof () && ! as_empty)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3041 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3042 state = is.rdstate (); // before tellg, since that fails at EOF
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3043 pos = is.tellg ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3044 ch = is.peek (); // ch == EOF if read failed; no need to chk fail
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3045 if (ch == 'i' \|\| ch == 'j') // pure imaginary
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3046 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3047 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3048 im = re;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3049 re = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3050 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3051 else if (ch == '+' \|\| ch == '-') // see if it is real+imag[ij]
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3052 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3053 // save stream state in case we have to restore it
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3054 pos = is.tellg ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3055 state = is.rdstate ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3056
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3057 //im = octave_read_value<double> (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3058 im = read_double (is, fmt);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3059 if (is.fail ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3060 im = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3061
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3062 if (is.peek () == 'i' \|\| is.peek () == 'j')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3063 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3064 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3065 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3066 im = 0; // no valid imaginary part. Restore state
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3067 is.clear (state); // eof shouldn't cause fail.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3068 is.seekg (pos);
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	3069 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3070 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3071 else if (is.eof ()) // we've read enough to be a "valid" read
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3072 is.clear (state); // failed peek shouldn't cause fail
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3073 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3074 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3075 if (as_empty)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3076 val = empty_value.scalar_value ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3077 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3078 val = Complex (re, im);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3079 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3080
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3081 // Return in VAL the run of characters from IS NOT contained in PATTERN.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3082
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3083 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3084 textscan::scan_caret (delimited_stream& is, const std::string& pattern,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3085 std::string& val) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3086 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3087 int c1 = std::istream::traits_type::eof ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3088 std::ostringstream obuf; // Is this optimized for growing?
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3089
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3090 while (is && ((c1 = (is && ! is.eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3091 ? is.get_undelim ()
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3092 : std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3093 != std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3094 && pattern.find (c1) == std::string::npos)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3095 obuf << static_cast<char> (c1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3096
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3097 val = obuf.str ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3098
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3099 if (c1 != std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3100 is.putback (c1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3101
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3102 return c1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3103 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3104
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3105 // Read until one of the strings in DELIMITERS is found. For
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3106 // efficiency, ENDS is a list of the last character of each delimiter.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3107
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3108 std::string
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3109 textscan::read_until (delimited_stream& is, const Cell& delimiters,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3110 const std::string& ends) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3111 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3112 std::string retval ("");
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3113 bool done = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3114 do
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3115 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3116 // find sequence ending with an ending char
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3117 std::string next;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3118 scan_caret (is, ends.c_str (), next);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3119 retval = retval + next; // FIXME: could use repeated doubling of size
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3120
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3121 int last = (! is.eof ()
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3122 ? is.get_undelim () : std::istream::traits_type::eof ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3123
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3124 if (last != std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3125 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3126 retval = retval + static_cast<char> (last);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3127 for (int i = 0; i < delimiters.numel (); i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3128 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3129 std::string delim = delimiters(i).string_value ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3130 size_t start = (retval.length () > delim.length ()
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3131 ? retval.length () - delim.length ()
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3132 : 0);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3133 std::string may_match = retval.substr (start);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3134 if (may_match == delim)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3135 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3136 done = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3137 retval = retval.substr (0, start);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3138 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3139 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3140 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3141 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3142 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3143 while (! done && is && ! is.eof ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3144
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3145 return retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3146 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3147
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3148 // Read stream until either fmt.width chars have been read, or
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3149 // options.delimiter has been found. Does not rely on fmt being 's'.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3150 // Used by formats like %6f to limit to 6.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3151
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3152 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3153 textscan::scan_string (delimited_stream& is, const textscan_format_elt& fmt,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3154 std::string& val) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3155 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3156 if (delim_list.is_empty ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3157 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3158 unsigned int i = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3159 unsigned int width = fmt.width;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3160
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3161 for (i = 0; i < width; i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3162 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3163 if (i+1 > val.length ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3164 val = val + val + ' '; // grow even if empty
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3165 int ch = is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3166 if (is_delim (ch) \|\| ch == std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3167 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3168 is.putback (ch);
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	3169 break;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3170 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3171 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3172 val[i] = ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3173 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3174 val = val.substr (0, i); // trim pre-allocation
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3175 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3176 else // Cell array of multi-character delimiters
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3177 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3178 std::string ends ("");
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3179 for (int i = 0; i < delim_list.numel (); i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3180 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3181 std::string tmp = delim_list(i).string_value ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3182 ends += tmp.substr (tmp.length () - 1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3183 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3184 val = textscan::read_until (is, delim_list, ends);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3185 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3186 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3187
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3188 // Return in VAL the run of characters from IS contained in PATTERN.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3189
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3190 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3191 textscan::scan_bracket (delimited_stream& is, const std::string& pattern,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3192 std::string& val) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3193 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3194 int c1 = std::istream::traits_type::eof ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3195 std::ostringstream obuf; // Is this optimized for growing?
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3196
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3197 while (is && pattern.find (c1 = is.get_undelim ()) != std::string::npos)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3198 obuf << static_cast<char> (c1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3199
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3200 val = obuf.str ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3201 if (c1 != std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3202 is.putback (c1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3203 return c1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3204 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3205
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3206 // Return in VAL a string, either delimited by whitespace/delimiters, or
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3207 // enclosed in a pair of double quotes ("..."). Enclosing quotes are
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3208 // removed. A consecutive pair "" is inserted into VAL as a single ".
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3209
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3210 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3211 textscan::scan_qstring (delimited_stream& is, const textscan_format_elt& fmt,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3212 std::string& val)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3213 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3214 skip_whitespace (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3215
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3216 if (is.peek () != '\"')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3217 scan_string (is, fmt, val);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3218 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3219 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3220 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3221 scan_caret (is, "\"", val); // read everything until "
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3222 is.get (); // swallow "
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3223
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3224 while (is && is.peek () == '\"') // if double ", insert one in stream,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3225 { // and keep looking for single "
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3226 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3227 std::string val1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3228 scan_caret (is, "\"", val1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3229 val = val + "\"" + val1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3230 is.get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3231 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3232 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3233 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3234
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3235 // Read from IS into VAL a string of the next fmt.width characters,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3236 // including any whitespace or delimiters.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3237
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3238 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3239 textscan::scan_cstring (delimited_stream& is, const textscan_format_elt& fmt,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3240 std::string& val) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3241 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3242 val.resize (fmt.width);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3243
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3244 for (unsigned int i = 0; is && i < fmt.width; i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3245 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3246 int ch = is.get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3247 if (ch != std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3248 val[i] = ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3249 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3250 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3251 val.resize (i);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3252 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3253 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3254 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3255 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3256
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3257 // Read a single '%...' conversion and place it in position ROW of OV.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3258
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3259 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3260 textscan::scan_one (delimited_stream& is, const textscan_format_elt& fmt,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3261 octave_value& ov, Array<octave_idx_type> row)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3262 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3263 skip_whitespace (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3264
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3265 is.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3266
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3267 octave_value val;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3268 if (fmt.numeric)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3269 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3270 if (fmt.type == 'f' \|\| fmt.type == 'n')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3271 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3272 Complex v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3273 skip_whitespace (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3274 scan_complex (is, fmt, v);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3275
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3276 if (! fmt.discard && ! is.fail ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3277 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3278 if (fmt.bitwidth == 64)
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	3279 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3280 if (ov.is_real_type () && v.imag () == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3281 ov.internal_rep ()->fast_elem_insert (row(0), v.real ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3282 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3283 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3284 if (ov.is_real_type ()) // cat does type conversion
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3285 ov = do_cat_op (ov, octave_value (v), row);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3286 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3287 ov.internal_rep ()->fast_elem_insert (row(0), v);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3288 }
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	3289 }
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	3290 else
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	3291 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3292 if (ov.is_real_type () && v.imag () == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3293 ov.internal_rep ()->fast_elem_insert (row(0),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3294 float (v.real ()));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3295 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3296 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3297 if (ov.is_real_type ()) // cat does type conversion
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3298 ov = do_cat_op (ov, octave_value (v), row);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3299 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3300 ov.internal_rep ()->fast_elem_insert (row(0),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3301 FloatComplex (v));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3302 }
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	3303 }
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	3304 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3305 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3306 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3307 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3308 double v; // Matlab docs say 1e30 etc should be valid for %d and
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3309 // 1000 as a %d8 should be 127, so read as double.
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3310 // Some loss of precision for d64 and u64.
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3311 skip_whitespace (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3312 v = read_double (is, fmt);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3313 if (! fmt.discard && ! is.fail ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3314 switch (fmt.bitwidth)
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	3315 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3316 case 64:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3317 switch (fmt.type)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3318 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3319 case 'd':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3320 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3321 octave_int64 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3322 ov.internal_rep ()->fast_elem_insert (row(0), vv);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3323 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3324 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3325
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3326 case 'u':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3327 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3328 octave_uint64 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3329 ov.internal_rep ()->fast_elem_insert (row(0), vv);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3330 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3331 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3332 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3333 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3334
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3335 case 32:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3336 switch (fmt.type)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3337 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3338 case 'd':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3339 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3340 octave_int32 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3341 ov.internal_rep ()->fast_elem_insert (row(0), vv);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3342 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3343 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3344
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3345 case 'u':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3346 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3347 octave_uint32 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3348 ov.internal_rep ()->fast_elem_insert (row(0), vv);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3349 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3350 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3351 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3352 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3353
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3354 case 16:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3355 if (fmt.type == 'd')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3356 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3357 octave_int16 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3358 ov.internal_rep ()->fast_elem_insert (row(0), vv);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3359 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3360 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3361 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3362 octave_uint16 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3363 ov.internal_rep ()->fast_elem_insert (row(0), vv);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3364 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3365 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3366
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3367 case 8:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3368 if (fmt.type == 'd')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3369 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3370 octave_int8 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3371 ov.internal_rep ()->fast_elem_insert (row(0), vv);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3372 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3373 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3374 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3375 octave_uint8 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3376 ov.internal_rep ()->fast_elem_insert (row(0), vv);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3377 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3378 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3379 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3380 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3381
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3382 if (is.fail () & ! fmt.discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3383 ov = do_cat_op (ov, empty_value, row);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3384 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3385 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3386 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3387 std::string vv (" "); // initial buffer. Grows as needed
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3388 switch (fmt.type)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3389 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3390 case 's':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3391 scan_string (is, fmt, vv);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3392 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3393
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3394 case 'q':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3395 scan_qstring (is, fmt, vv);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3396 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3397
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3398 case 'c':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3399 scan_cstring (is, fmt, vv);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3400 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3401
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3402 case '[':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3403 scan_bracket (is, fmt.char_class.c_str (), vv);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3404 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3405
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3406 case '^':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3407 scan_caret (is, fmt.char_class.c_str (), vv);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3408 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3409 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3410
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3411 if (! fmt.discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3412 ov.internal_rep ()->fast_elem_insert (row (0),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3413 Cell (octave_value (vv)));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3414
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3415 // FIXME: why does failbit get set at EOF, instead of eofbit?
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3416 if (! vv.empty ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3417 is.clear (is.rdstate () & ~std::ios_base::failbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3418 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3419
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3420 is.field_done ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3421 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3422
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3423 // Read data corresponding to the entire format string once, placing the
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3424 // values in row ROW of retval.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3425
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3426 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3427 textscan::read_format_once (delimited_stream& is,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3428 textscan_format_list& fmt_list,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3429 std::list<octave_value>& retval,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3430 Array<octave_idx_type> row, int& done_after)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3431 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3432 const textscan_format_elt *elem = fmt_list.first ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3433 std::list<octave_value>::iterator out = retval.begin ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3434 bool no_conversions = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3435 bool done = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3436 bool conversion_failed = false; // Record for ReturnOnError
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3437 bool nothing_worked = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3438
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3439 octave_quit ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3440
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3441 for (size_t i = 0; i < fmt_list.numel (); i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3442 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3443 bool this_conversion_failed = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3444
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3445 // Clear fail of previous numeric conversions.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3446 is.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3447
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3448 switch (elem->type)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3449 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3450 case 'C':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3451 case 'D':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3452 warning ("%s: conversion %c not yet implemented",
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3453 who.c_str (), elem->type);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3454 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3455
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3456 case 'u':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3457 case 'd':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3458 case 'f':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3459 case 'n':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3460 case 's':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3461 case '[':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3462 case '^':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3463 case 'q':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3464 case 'c':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3465 scan_one (is, elem, out, row);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3466 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3467
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3468 case textscan_format_elt::literal_conversion :
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3469 match_literal (is, *elem);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3470 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3471
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3472 default:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3473 error ("Unknown format element '%c'", elem->type);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3474 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3475
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3476 if (! is.fail ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3477 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3478 if (! elem->discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3479 no_conversions = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3480 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3481 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3482 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3483 is.clear (is.rdstate () & ~std::ios::failbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3484
22737 7abc25e6206a maint: Clean up code base to follow Octave coding conventions. Rik <rik@octave.org> parents: 22407 diff changeset	3485 if (! is.eof () && ~is_delim (is.peek ()))
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3486 this_conversion_failed = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3487 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3488
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3489 if (! elem->discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3490 out++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3491
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3492 elem = fmt_list.next ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3493 char *pos = is.tellg ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3494
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3495 // FIXME: these conversions "ignore delimiters". Should they include
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3496 // delimiters at the start of the conversion, or can those be skipped?
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3497 if (elem->type != textscan_format_elt::literal_conversion
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3498 // && elem->type != '[' && elem->type != '^' && elem->type != 'c'
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3499 )
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3500 skip_delim (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3501
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3502 if (is.eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3503 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3504 if (! done)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3505 done_after = i+1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3506
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3507 // note EOF, but process others to get empty_val.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3508 done = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3509 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3510
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3511 if (this_conversion_failed)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3512 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3513 if (is.tellg () == pos && ! conversion_failed)
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3514 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3515 // done_after = first failure
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3516 done_after = i; // note fail, but parse others to get empty_val
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3517 conversion_failed = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3518 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3519 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3520 this_conversion_failed = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3521 }
22737 7abc25e6206a maint: Clean up code base to follow Octave coding conventions. Rik <rik@octave.org> parents: 22407 diff changeset	3522 else if (! done && ! conversion_failed)
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3523 nothing_worked = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3524 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3525
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3526 if (done)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3527 is.setstate (std::ios::eofbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3528
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3529 return no_conversions
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3530 + (is.eof () ? 2 : 0)
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3531 + (conversion_failed ? 4 : 0)
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3532 + (nothing_worked ? 8 : 0);
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3533
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3534 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3535
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3536 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3537 textscan::parse_options (const octave_value_list& args,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3538 textscan_format_list& fmt_list)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3539 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3540 int last = args.length ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3541 int n = last;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3542
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3543 if (n & 1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3544 error ("%s: %d parameters given, but only %d values",
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3545 who.c_str (), n-n/2, n/2);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3546
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3547 delim_len = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3548 bool have_delims = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3549 for (int i = 0; i < last; i += 2)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3550 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3551 std::string param = args(i).xstring_value ("%s: Invalid parameter type <%s> for parameter %d",
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3552 who.c_str (),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3553 args(i).type_name ().c_str (),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3554 i/2 + 1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3555 std::transform (param.begin (), param.end (), param.begin (), ::tolower);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3556
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3557 if (param == "delimiter")
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3558 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3559 bool invalid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3560 if (args(i+1).is_string ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3561 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3562 invalid = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3563 have_delims = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3564 delims = args(i+1).string_value ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3565 if (args(i+1).is_sq_string ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3566 delims = do_string_escapes (delims);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3567 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3568 else if (args(i+1).is_cell ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3569 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3570 invalid = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3571 delim_list = args(i+1).cell_value ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3572 delim_table = " "; // non-empty, to flag non-default delim
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3573
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3574 // Check that all elements are strings, and find max length
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3575 for (int j = 0; j < delim_list.numel (); j++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3576 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3577 if (! delim_list(j).is_string ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3578 invalid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3579 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3580 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3581 if (delim_list(j).is_sq_string ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3582 delim_list(j) = do_string_escapes (delim_list(j)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3583 .string_value ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3584 octave_idx_type len = delim_list(j).string_value ()
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3585 .length ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3586 delim_len = std::max (static_cast<int> (len), delim_len);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3587 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3588 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3589 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3590 if (invalid)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3591 error ("%s: Delimiters must be either a string or cell array of strings",
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3592 who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3593 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3594 else if (param == "commentstyle")
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3595 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3596 if (args(i+1).is_string ())
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3597 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3598 // check here for names like "C++", "C", "shell", ...?
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3599 comment_style = Cell (args(i+1));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3600 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3601 else if (args(i+1).is_cell ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3602 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3603 comment_style = args(i+1).cell_value ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3604 int len = comment_style.numel ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3605 if ((len >= 1 && ! comment_style (0).is_string ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3606 \|\| (len >= 2 && ! comment_style (1).is_string ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3607 \|\| (len >= 3))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3608 error ("%s: CommentStyle must be either a string or cell array of one or two strings",
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3609 who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3610 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3611 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3612 error ("%s: CommentStyle must be either a string or cell array of one or two strings",
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3613 who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3614
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3615 // How far ahead do we need to look to detect an open comment
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3616 // and which character do we look for?
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3617 if (comment_style.numel () >= 1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3618 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3619 comment_len = comment_style (0).string_value ().size ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3620 comment_char = comment_style (0).string_value ()[0];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3621 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3622 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3623 else if (param == "treatasempty")
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3624 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3625 bool invalid = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3626 if (args(i+1).is_string ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3627 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3628 treat_as_empty = Cell (args(i+1));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3629 treat_as_empty_len = args(i+1).string_value ().size ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3630 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3631 else if (args(i+1).is_cell ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3632 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3633 treat_as_empty = args(i+1).cell_value ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3634 for (int j = 0; j < treat_as_empty.numel (); j++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3635 if (! treat_as_empty (j).is_string ())
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	3636 invalid = true;
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	3637 else
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	3638 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3639 int k = treat_as_empty (j).string_value ().size ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3640 if (k > treat_as_empty_len)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3641 treat_as_empty_len = k;
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	3642 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3643 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3644 if (invalid)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3645 error ("%s: TreatAsEmpty must be either a string or cell array of one or two strings",
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3646 who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3647
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3648 // FIXME: Ensure none is a prefix of a later one. Sort by length?
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3649 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3650 else if (param == "collectoutput")
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3651 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3652 collect_output = args(i+1).xbool_value ("%s: CollectOutput must be logical or numeric", who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3653 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3654 else if (param == "emptyvalue")
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3655 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3656 empty_value = args(i+1).xscalar_value ("%s: EmptyValue must be numeric", who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3657 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3658 else if (param == "headerlines")
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3659 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3660 header_lines = args(i+1).xscalar_value ("%s: HeaderLines must be numeric", who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3661 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3662 else if (param == "bufsize")
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3663 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3664 buffer_size = args(i+1).xscalar_value ("%s: BufSize must be numeric", who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3665 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3666 else if (param == "multipledelimsasone")
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3667 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3668 multiple_delims_as_one = args(i+1).xbool_value ("%s: MultipleDelimsAsOne must be logical or numeric", who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3669 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3670 else if (param == "returnonerror")
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3671 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3672 return_on_error = args(i+1).xbool_value ("%s: ReturnOnError must be logical or numeric", who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3673 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3674 else if (param == "whitespace")
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3675 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3676 whitespace = args(i+1).xstring_value ("%s: Whitespace must be a character string", who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3677 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3678 else if (param == "expchars")
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3679 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3680 exp_chars = args(i+1).xstring_value ("%s: ExpChars must be a character string", who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3681 default_exp = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3682 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3683 else if (param == "endofline")
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3684 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3685 bool valid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3686 std::string s = args(i+1).xstring_value ("%s: EndOfLine must be at most one character or '\\r\\n'", who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3687 if (args(i+1).is_sq_string ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3688 s = do_string_escapes (s);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3689 int l = s.length ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3690 if (l == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3691 eol1 = eol2 = -2;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3692 else if (l == 1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3693 eol1 = eol2 = s.c_str ()[0];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3694 else if (l == 2)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3695 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3696 eol1 = s.c_str ()[0];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3697 eol2 = s.c_str ()[1];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3698 if (eol1 != '\r' \|\| eol2 != '\n') // Why limit it?
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3699 valid = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3700 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3701 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3702 valid = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3703
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3704 if (! valid)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3705 error ("%s: EndOfLine must be at most one character or '\\r\\n'",
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3706 who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3707 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3708 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3709 error ("%s: unrecognized option '%s'", who.c_str (), param.c_str ());
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	3710 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3711
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3712 whitespace_table = std::string (256, '\0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3713 for (unsigned int i = 0; i < whitespace.length (); i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3714 whitespace_table[whitespace[i]] = '1';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3715
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3716 // For Matlab compatibility, add 0x20 to whitespace, unless
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3717 // whitespace is explicitly ignored.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3718 if (! (whitespace.empty () && fmt_list.has_string))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3719 whitespace_table[' '] = '1';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3720
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3721 // Create look-up table of delimiters, based on 'delimiter'
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3722 delim_table = std::string (256, '\0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3723 if (eol1 >= 0 && eol1 < 256)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3724 delim_table[eol1] = '1'; // EOL is always a delimiter
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3725 if (eol2 >= 0 && eol2 < 256)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3726 delim_table[eol2] = '1'; // EOL is always a delimiter
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3727 if (! have_delims)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3728 for (unsigned int i = 0; i < 256; i++)
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	3729 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3730 if (isspace (i))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3731 delim_table[i] = '1';
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	3732 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3733 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3734 for (unsigned int i = 0; i < delims.length (); i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3735 delim_table[delims[i]] = '1';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3736 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3737
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3738 // Skip comments, and characters specified by the "Whitespace" option.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3739 // If EOLstop == true, don't skip end of line.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3740
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3741 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3742 textscan::skip_whitespace (delimited_stream& is, bool EOLstop)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3743 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3744 int c1 = std::istream::traits_type::eof ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3745 bool found_comment = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3746
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3747 do
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3748 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3749 found_comment = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3750 int prev = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3751 while (is && (c1 = is.get_undelim ()) != std::istream::traits_type::eof ()
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3752 && ( ( (c1 == eol1 \|\| c1 == eol2) && ++lines && ! EOLstop)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3753 \|\| isspace (c1)))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3754 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3755 if (prev == eol1 && eol1 != eol2 && c1 == eol2)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3756 lines--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3757 prev = c1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3758 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3759
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3760 if (c1 == comment_char) // see if we match an open comment
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3761 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3762 // save stream state in case we have to restore it
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3763 char *pos = is.tellg ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3764 std::ios::iostate state = is.rdstate ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3765
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3766 std::string tmp (comment_len, '\0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3767 char *look = is.read (&tmp[0], comment_len-1, pos); // already read first char
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3768 if (is && ! strncmp (comment_style(0).string_value ().substr (1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3769 .c_str (), look, comment_len-1))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3770 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3771 found_comment = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3772
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3773 std::string dummy;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3774 if (comment_style.numel () == 1) // skip to end of line
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3775 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3776 std::string eol (3, '\0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3777 eol[0] = eol1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3778 eol[1] = eol2;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3779
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3780 scan_caret (is, eol, dummy);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3781 c1 = is.get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3782 if (c1 == eol1 && eol1 != eol2 && is.peek_undelim () == eol2)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3783 is.get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3784 lines++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3785 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3786 else // matching pair
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3787 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3788 std::string end_c = comment_style(1).string_value ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3789 // last char of end-comment sequence
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3790 std::string last = end_c.substr (end_c.size () - 1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3791 std::string may_match ("");
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3792 do
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3793 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3794 // find sequence ending with last char
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3795 scan_caret (is, last, dummy);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3796 is.get_undelim (); // (read LAST itself)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3797
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3798 may_match = may_match + dummy + last;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3799 if (may_match.length () > end_c.length ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3800 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3801 size_t start = may_match.length () - end_c.length ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3802 may_match = may_match.substr (start);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3803 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3804 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3805 while (may_match != end_c && is && ! is.eof ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3806 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3807 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3808 else // wasn't really a comment; restore state
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3809 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3810 is.clear (state);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3811 is.seekg (pos);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3812 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3813 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3814 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3815 while (found_comment);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3816
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3817 if (c1 != std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3818 is.putback (c1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3819 return c1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3820 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3821
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3822 // See if the next few characters match one of the strings in target.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3823 // For efficiency, MAX_LEN is the cached longest length of any target.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3824 // Return -1 if none is found, or the index of the match.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3825
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3826 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3827 textscan::lookahead (delimited_stream& is, const Cell& targets, int max_len,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3828 bool case_sensitive) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3829 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3830 // target strings may be different sizes.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3831 // Read ahead longest, put it all back, then re-read the string
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3832 // that matches.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3833
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3834 char *pos = is.tellg ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3835
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3836 std::string tmp (max_len, '\0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3837 char *look = is.read (&tmp[0], tmp.size (), pos);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3838
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3839 is.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3840 is.seekg (pos); // reset to position before look-ahead
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3841 // FIXME: pos may be corrupted by is.read
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3842
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3843 int i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3844 int (compare)(const char , const char *, size_t);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3845 compare = case_sensitive ? strncmp : strncasecmp;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3846
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3847 for (i = 0; i < targets.numel (); i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3848 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3849 std::string s = targets (i).string_value ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3850 if (! (*compare) (s.c_str (), look, s.size ()))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3851 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3852 is.read (&tmp[0], s.size (), pos); // read just the right amount
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3853 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3854 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3855 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3856
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3857 if (i == targets.numel ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3858 i = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3859
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3860 return i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3861 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3862
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3863 // Skip delimiters -- multiple if MultipleDelimsAsOne specified.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3864 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3865 textscan::skip_delim (delimited_stream& is)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3866 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3867 int c1 = skip_whitespace (is, true); // 'true': stop once EOL is read
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3868 if (delim_list.numel () == 0) // single character delimiter
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3869 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3870 if (is_delim (c1) \|\| c1 == eol1 \|\| c1 == eol2)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3871 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3872 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3873 if (c1 == eol1 && is.peek_undelim () == eol2)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3874 is.get_undelim (); // if \r\n, skip the \n too.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3875
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3876 if (multiple_delims_as_one)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3877 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3878 int prev = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3879 // skip multiple delims.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3880 // Increment lines for each end-of-line seen; for \r\n, decrement
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3881 while (is && ((c1 = is.get_undelim ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3882 != std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3883 && (((c1 == eol1 \|\| c1 == eol2) && ++lines)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3884 \|\| isspace (c1) \|\| is_delim (c1)))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3885 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3886 if (prev == eol1 && eol1 != eol2 && c1 == eol2)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3887 lines--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3888 prev = c1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3889 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3890 if (c1 != std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3891 is.putback (c1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3892 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3893 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3894 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3895 else // multi-character delimiter
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3896 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3897 int first_match;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3898
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3899 if (c1 == eol1 \|\| c1 == eol2
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3900 \|\| (-1 != (first_match = lookahead (is, delim_list, delim_len))))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3901 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3902 if (c1 == eol1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3903 {
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	3904 is.get_undelim ();
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3905 if (is.peek_undelim () == eol2)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3906 is.get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3907 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3908 else if (c1 == eol2)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3909 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3910 is.get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3911 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3912
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3913 if (multiple_delims_as_one)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3914 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3915 int prev = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3916 // skip multiple delims.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3917 // Increment lines for each end-of-line seen; for \r\n, decrement
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3918 while (is && ((c1 = skip_whitespace (is, true))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3919 != std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3920 && (((c1 == eol1 \|\| c1 == eol2) && ++lines)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3921 \|\| -1 != lookahead (is, delim_list, delim_len)))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3922 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3923 if (prev == eol1 && eol1 != eol2 && c1 == eol2)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3924 lines--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3925 prev = c1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3926 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3927 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3928 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3929 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3930
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3931 return c1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3932 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3933
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3934 // Read in as much of the input as coincides with the literal in the
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3935 // format string. Return "true" if the entire literal is matched, else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3936 // false (and set failbit).
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3937
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3938 bool
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3939 textscan::match_literal (delimited_stream& is, const textscan_format_elt& fmt)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3940 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3941 // "false" -> treat EOL as normal space
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3942 // since a delimiter at the start of a line is a mismatch, not empty field
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3943 skip_whitespace (is, false);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3944
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3945 for (unsigned int i = 0; i < fmt.width; i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3946 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3947 int ch = is.get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3948 if (ch != fmt.text[i])
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3949 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3950 if (ch != std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3951 is.putback (ch);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3952 is.setstate (std::ios::failbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3953 return false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3954 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3955 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3956 return true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3957 }
21502 7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	3958 }
7a19c5678f91 move textscan class to oct-stream.cc and textscan function to file-io.cc John W. Eaton <jwe@octave.org> parents: 21477 diff changeset	3959
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	3960 void
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	3961 octave_base_stream::error (const std::string& msg)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	3962 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	3963 fail = true;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	3964 errmsg = msg;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	3965 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	3966
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	3967 void
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	3968 octave_base_stream::error (const std::string& who, const std::string& msg)
efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	3969 {
efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	3970 fail = true;
6296 85eb75190e01 [project @ 2007-02-10 07:10:42 by jwe] jwe parents: 6109 diff changeset	3971 errmsg = who + ": " + msg;
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	3972 }
efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	3973
efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	3974 void
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	3975 octave_base_stream::clear (void)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	3976 {
4889 658aad1c1b05 [project @ 2004-04-30 22:38:30 by jwe] jwe parents: 4888 diff changeset	3977 fail = false;
658aad1c1b05 [project @ 2004-04-30 22:38:30 by jwe] jwe parents: 4888 diff changeset	3978 errmsg = "";
658aad1c1b05 [project @ 2004-04-30 22:38:30 by jwe] jwe parents: 4888 diff changeset	3979 }
658aad1c1b05 [project @ 2004-04-30 22:38:30 by jwe] jwe parents: 4888 diff changeset	3980
658aad1c1b05 [project @ 2004-04-30 22:38:30 by jwe] jwe parents: 4888 diff changeset	3981 void
658aad1c1b05 [project @ 2004-04-30 22:38:30 by jwe] jwe parents: 4888 diff changeset	3982 octave_base_stream::clearerr (void)
658aad1c1b05 [project @ 2004-04-30 22:38:30 by jwe] jwe parents: 4888 diff changeset	3983 {
4888 4a796c5fc7a3 [project @ 2004-04-30 18:27:07 by jwe] jwe parents: 4874 diff changeset	3984 std::istream *is = input_stream ();
4a796c5fc7a3 [project @ 2004-04-30 18:27:07 by jwe] jwe parents: 4874 diff changeset	3985 std::ostream *os = output_stream ();
4a796c5fc7a3 [project @ 2004-04-30 18:27:07 by jwe] jwe parents: 4874 diff changeset	3986
4a796c5fc7a3 [project @ 2004-04-30 18:27:07 by jwe] jwe parents: 4874 diff changeset	3987 if (is)
4a796c5fc7a3 [project @ 2004-04-30 18:27:07 by jwe] jwe parents: 4874 diff changeset	3988 is->clear ();
4a796c5fc7a3 [project @ 2004-04-30 18:27:07 by jwe] jwe parents: 4874 diff changeset	3989
4a796c5fc7a3 [project @ 2004-04-30 18:27:07 by jwe] jwe parents: 4874 diff changeset	3990 if (os)
4a796c5fc7a3 [project @ 2004-04-30 18:27:07 by jwe] jwe parents: 4874 diff changeset	3991 os->clear ();
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	3992 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	3993
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	3994 // Functions that are defined for all input streams (input streams
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	3995 // are those that define is).
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	3996
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3535 diff changeset	3997 std::string
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5266 diff changeset	3998 octave_base_stream::do_gets (octave_idx_type max_len, bool& err,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	3999 bool strip_newline, const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4000 {
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	4001 if (octave::application::interactive () && file_number () == 0)
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20768 diff changeset	4002 ::error ("%s: unable to read from stdin while running interactively",
35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20768 diff changeset	4003 who.c_str ());
8773 9e3111d203c0 disallow reading from stdin while running interactively John W. Eaton <jwe@octave.org> parents: 8739 diff changeset	4004
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	4005 std::string retval;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4006
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4007 err = false;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4008
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	4009 std::istream *isp = input_stream ();
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4010
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4011 if (! isp)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4012 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4013 err = true;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4014 invalid_operation (who, "reading");
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4015 }
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4016 else
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4017 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	4018 std::istream& is = *isp;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4019
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	4020 std::ostringstream buf;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4021
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4022 int c = 0;
3553 c5600b44bef9 [project @ 2000-02-03 03:22:37 by jwe] jwe parents: 3552 diff changeset	4023 int char_count = 0;
6345 9e058e5fa8a7 [project @ 2007-02-22 22:22:53 by jwe] jwe parents: 6297 diff changeset	4024
9e058e5fa8a7 [project @ 2007-02-22 22:22:53 by jwe] jwe parents: 6297 diff changeset	4025 if (max_len != 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4026 {
21184 3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4027 while (is && (c = is.get ()) != std::istream::traits_type::eof ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4028 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4029 char_count++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4030
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4031 // Handle CRLF, CR, or LF as line ending.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4032 if (c == '\r')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4033 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4034 if (! strip_newline)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4035 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4036
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4037 c = is.get ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4038
21184 3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4039 if (c != std::istream::traits_type::eof ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4040 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4041 if (c == '\n')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4042 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4043 char_count++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4044
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4045 if (! strip_newline)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4046 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4047 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4048 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4049 is.putback (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4050 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4051
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4052 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4053 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4054 else if (c == '\n')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4055 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4056 if (! strip_newline)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4057 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4058
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4059 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4060 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4061 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4062 buf << static_cast<char> (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4063
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4064 if (max_len > 0 && char_count == max_len)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4065 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4066 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4067 }
6345 9e058e5fa8a7 [project @ 2007-02-22 22:22:53 by jwe] jwe parents: 6297 diff changeset	4068
9e058e5fa8a7 [project @ 2007-02-22 22:22:53 by jwe] jwe parents: 6297 diff changeset	4069 if (! is.eof () && char_count > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4070 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4071 // GAGME. Matlab seems to check for EOF even if the last character
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4072 // in a file is a newline character. This is NOT what the
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4073 // corresponding C-library functions do.
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4074 int disgusting_compatibility_hack = is.get ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4075 if (! is.eof ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4076 is.putback (disgusting_compatibility_hack);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4077 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4078
4224 0179e6309248 [project @ 2002-12-18 00:34:29 by jwe] jwe parents: 4223 diff changeset	4079 if (is.good () \|\| (is.eof () && char_count > 0))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4080 retval = buf.str ();
4224 0179e6309248 [project @ 2002-12-18 00:34:29 by jwe] jwe parents: 4223 diff changeset	4081 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4082 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4083 err = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4084
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4085 if (is.eof () && char_count == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4086 error (who, "at end of file");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4087 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4088 error (who, "read error");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4089 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4090 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4091
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4092 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4093 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4094
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3535 diff changeset	4095 std::string
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4096 octave_base_stream::getl (octave_idx_type max_len, bool& err,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4097 const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4098 {
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	4099 return do_gets (max_len, err, true, who);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4100 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4101
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3535 diff changeset	4102 std::string
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4103 octave_base_stream::gets (octave_idx_type max_len, bool& err,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4104 const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4105 {
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	4106 return do_gets (max_len, err, false, who);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4107 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4108
16011 8122286c69a9 initial large file support for 32-bit systems John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	4109 off_t
8122286c69a9 initial large file support for 32-bit systems John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	4110 octave_base_stream::skipl (off_t num, bool& err, const std::string& who)
9701 531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4111 {
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	4112 if (octave::application::interactive () && file_number () == 0)
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4113 ::error ("%s: unable to read from stdin while running interactively",
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4114 who.c_str ());
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4115
16011 8122286c69a9 initial large file support for 32-bit systems John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	4116 off_t cnt = -1;
9701 531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4117
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4118 err = false;
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4119
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4120 std::istream *isp = input_stream ();
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4121
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4122 if (! isp)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4123 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4124 err = true;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4125 invalid_operation (who, "reading");
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4126 }
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4127 else
9701 531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4128 {
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4129 std::istream& is = *isp;
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4130
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	4131 int c = 0;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	4132 int lastc = -1;
9701 531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4133 cnt = 0;
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4134
21184 3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4135 while (is && (c = is.get ()) != std::istream::traits_type::eof ())
9701 531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4136 {
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4137 // Handle CRLF, CR, or LF as line ending.
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4138 if (c == '\r' \|\| (c == '\n' && lastc != '\r'))
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4139 {
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4140 if (++cnt == num)
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4141 break;
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4142 }
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4143
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4144 lastc = c;
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4145 }
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4146
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4147 // Maybe eat the following \n if \r was just met.
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4148 if (c == '\r' && is.peek () == '\n')
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4149 is.get ();
9701 531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4150
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4151 if (is.bad ())
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4152 {
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4153 err = true;
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4154 error (who, "read error");
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4155 }
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4156
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4157 if (err)
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4158 cnt = -1;
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4159 }
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4160
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4161 return cnt;
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4162 }
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4163
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	4164 template <typename T>
3636 0aeae5fe4ab7 [project @ 2000-03-24 04:27:23 by jwe] jwe parents: 3635 diff changeset	4165 std::istream&
6767 a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4166 octave_scan_1 (std::istream& is, const scanf_format_elt& fmt, T* valptr)
3636 0aeae5fe4ab7 [project @ 2000-03-24 04:27:23 by jwe] jwe parents: 3635 diff changeset	4167 {
21687 4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4168 T value = T ();
3779 3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3775 diff changeset	4169
3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3775 diff changeset	4170 switch (fmt.type)
3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3775 diff changeset	4171 {
3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3775 diff changeset	4172 case 'o':
21687 4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4173 is >> std::oct >> value >> std::dec;
3779 3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3775 diff changeset	4174 break;
3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3775 diff changeset	4175
3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3775 diff changeset	4176 case 'x':
21687 4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4177 is >> std::hex >> value >> std::dec;
4926 e80587ad9503 [project @ 2004-08-02 23:48:40 by jwe] jwe parents: 4889 diff changeset	4178 break;
e80587ad9503 [project @ 2004-08-02 23:48:40 by jwe] jwe parents: 4889 diff changeset	4179
e80587ad9503 [project @ 2004-08-02 23:48:40 by jwe] jwe parents: 4889 diff changeset	4180 case 'i':
e80587ad9503 [project @ 2004-08-02 23:48:40 by jwe] jwe parents: 4889 diff changeset	4181 {
21184 3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4182 int c1 = std::istream::traits_type::eof ();
3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4183
3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4184 while (is && (c1 = is.get ()) != std::istream::traits_type::eof ()
3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4185 && isspace (c1))
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	4186 ; // skip whitespace
14675 757f729fd41d skip leading whitespace for scanf %i format John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	4187
21184 3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4188 if (c1 != std::istream::traits_type::eof ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4189 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4190 if (c1 == '0')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4191 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4192 int c2 = is.peek ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4193
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4194 if (c2 == 'x' \|\| c2 == 'X')
7709 fa41af732801 octave_scan_1: fix reading of hex numbers Jaroslav Hajek <highegg@gmail.com> parents: 7538 diff changeset	4195 {
fa41af732801 octave_scan_1: fix reading of hex numbers Jaroslav Hajek <highegg@gmail.com> parents: 7538 diff changeset	4196 is.ignore ();
fa41af732801 octave_scan_1: fix reading of hex numbers Jaroslav Hajek <highegg@gmail.com> parents: 7538 diff changeset	4197 if (std::isxdigit (is.peek ()))
21687 4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4198 is >> std::hex >> value >> std::dec;
7709 fa41af732801 octave_scan_1: fix reading of hex numbers Jaroslav Hajek <highegg@gmail.com> parents: 7538 diff changeset	4199 else
21687 4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4200 value = 0;
7709 fa41af732801 octave_scan_1: fix reading of hex numbers Jaroslav Hajek <highegg@gmail.com> parents: 7538 diff changeset	4201 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4202 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4203 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4204 if (c2 == '0' \|\| c2 == '1' \|\| c2 == '2'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4205 \|\| c2 == '3' \|\| c2 == '4' \|\| c2 == '5'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4206 \|\| c2 == '6' \|\| c2 == '7')
21687 4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4207 is >> std::oct >> value >> std::dec;
21114 47908b818865 oct-stream.cc: Add FIXME note about bug #46493. Rik <rik@octave.org> parents: 21102 diff changeset	4208 else if (c2 == '8' \|\| c2 == '9')
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	4209 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	4210 // FIXME: Would like to set error state on octave
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	4211 // stream. See bug #46493. But only std::istream is
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	4212 // input to fcn.
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	4213 // error ("internal failure to match octal format");
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	4214 value = 0;
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	4215 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4216 else
21687 4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4217 value = 0;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4218 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4219 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4220 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4221 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4222 is.putback (c1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4223
21687 4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4224 is >> value;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4225 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4226 }
4926 e80587ad9503 [project @ 2004-08-02 23:48:40 by jwe] jwe parents: 4889 diff changeset	4227 }
3779 3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3775 diff changeset	4228 break;
3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3775 diff changeset	4229
3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3775 diff changeset	4230 default:
21687 4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4231 is >> value;
3779 3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3775 diff changeset	4232 break;
3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3775 diff changeset	4233 }
3639 fed1847dfd6c [project @ 2000-03-24 05:12:46 by jwe] jwe parents: 3638 diff changeset	4234
21687 4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4235 // If conversion produces an integer that overflows, failbit is set but
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21739 diff changeset	4236 // value is non-zero. We want to treat this case as success, so clear
21687 4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4237 // failbit from the stream state to keep going.
4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4238 // FIXME: Maybe set error state on octave stream as above? Matlab does
4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4239 // not indicate an error message on overflow.
4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4240 if ((is.rdstate () & std::ios::failbit) && value != T ())
4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4241 is.clear (is.rdstate () & ~std::ios::failbit);
4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4242
4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4243 // Only copy the converted value if the stream is in a state where we
4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4244 // want to continue reading.
4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4245 if (! (is.rdstate () & std::ios::failbit))
4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4246 *valptr = value;
4418e579cca6 scanf: return maximum/minimum value on integer overflow (bug #47759) Mike Miller <mtmiller@octave.org> parents: 21686 diff changeset	4247
3638 a76fa215a476 [project @ 2000-03-24 04:53:45 by jwe] jwe parents: 3637 diff changeset	4248 return is;
3636 0aeae5fe4ab7 [project @ 2000-03-24 04:27:23 by jwe] jwe parents: 3635 diff changeset	4249 }
0aeae5fe4ab7 [project @ 2000-03-24 04:27:23 by jwe] jwe parents: 3635 diff changeset	4250
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	4251 template <typename T>
6767 a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4252 std::istream&
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4253 octave_scan (std::istream& is, const scanf_format_elt& fmt, T* valptr)
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4254 {
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4255 if (fmt.width)
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4256 {
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4257 // Limit input to fmt.width characters by reading into a
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4258 // temporary stringstream buffer.
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4259 std::string tmp;
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4260
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4261 is.width (fmt.width);
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4262 is >> tmp;
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4263
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4264 std::istringstream ss (tmp);
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4265
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4266 octave_scan_1 (ss, fmt, valptr);
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4267 }
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4268 else
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4269 octave_scan_1 (is, fmt, valptr);
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4270
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4271 return is;
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4272 }
a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6757 diff changeset	4273
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11574 diff changeset	4274 // Note that this specialization is only used for reading characters, not
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21739 diff changeset	4275 // character strings. See BEGIN_S_CONVERSION for details.
3779 3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3775 diff changeset	4276
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	4277 template <>
3779 3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3775 diff changeset	4278 std::istream&
4661 12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4649 diff changeset	4279 octave_scan<> (std::istream& is, const scanf_format_elt& /* fmt */,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4280 char* valptr)
3779 3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3775 diff changeset	4281 {
3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3775 diff changeset	4282 return is >> valptr;
3001e15555e9 [project @ 2001-02-07 04:47:51 by jwe] jwe parents: 3775 diff changeset	4283 }
3636 0aeae5fe4ab7 [project @ 2000-03-24 04:27:23 by jwe] jwe parents: 3635 diff changeset	4284
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	4285 template <>
5176 10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4286 std::istream&
5403 7bdddf96f028 [project @ 2005-07-07 16:46:23 by jwe] jwe parents: 5389 diff changeset	4287 octave_scan<> (std::istream& is, const scanf_format_elt& fmt, double* valptr)
5176 10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4288 {
10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4289 double& ref = *valptr;
10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4290
10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4291 switch (fmt.type)
10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4292 {
10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4293 case 'e':
10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4294 case 'f':
10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4295 case 'g':
10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4296 {
21184 3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4297 int c1 = std::istream::traits_type::eof ();
3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4298
3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4299 while (is && (c1 = is.get ()) != std::istream::traits_type::eof ()
3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4300 && isspace (c1))
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	4301 ; // skip whitespace
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4302
21184 3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4303 if (c1 != std::istream::traits_type::eof ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4304 {
12936 b74cb659e757 accept but discard sign when reading NA and NaN values John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	4305 is.putback (c1);
b74cb659e757 accept but discard sign when reading NA and NaN values John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	4306
b74cb659e757 accept but discard sign when reading NA and NaN values John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	4307 ref = octave_read_value<double> (is);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4308 }
5176 10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4309 }
10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4310 break;
10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4311
10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4312 default:
10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4313 panic_impossible ();
10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4314 break;
10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4315 }
10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4316
10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4317 return is;
10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4318 }
10172b519695 [project @ 2005-03-02 19:14:13 by jwe] jwe parents: 5065 diff changeset	4319
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	4320 template <typename T>
2572 5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	4321 void
3636 0aeae5fe4ab7 [project @ 2000-03-24 04:27:23 by jwe] jwe parents: 3635 diff changeset	4322 do_scanf_conv (std::istream& is, const scanf_format_elt& fmt,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4323 T valptr, Matrix& mval, double *data, octave_idx_type& idx,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4324 octave_idx_type& conversion_count, octave_idx_type nr,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4325 octave_idx_type max_size, bool discard)
2572 5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	4326 {
21147 95feb42d7a97 * oct-stream.cc (OCTAVE_SCAN): Eliminate trivial macro. John W. Eaton <jwe@octave.org> parents: 21139 diff changeset	4327 octave_scan (is, fmt, valptr);
2572 5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	4328
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4329 if (! is)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4330 return;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4331
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4332 if (idx == max_size && ! discard)
2572 5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	4333 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4334 max_size *= 2;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4335
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4336 if (nr > 0)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4337 mval.resize (nr, max_size / nr, 0.0);
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4338 else
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4339 mval.resize (max_size, 1, 0.0);
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4340
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4341 data = mval.fortran_vec ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4342 }
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4343
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4344 if (! discard)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4345 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4346 conversion_count++;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4347 data[idx++] = *(valptr);
2572 5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	4348 }
5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	4349 }
5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	4350
5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	4351 template void
3636 0aeae5fe4ab7 [project @ 2000-03-24 04:27:23 by jwe] jwe parents: 3635 diff changeset	4352 do_scanf_conv (std::istream&, const scanf_format_elt&, double*,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4353 Matrix&, double*, octave_idx_type&, octave_idx_type&,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4354 octave_idx_type, octave_idx_type, bool);
2572 5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	4355
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4356 #define DO_WHITESPACE_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4357 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4358 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4359 int c = std::istream::traits_type::eof (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4360 \
21184 3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4361 while (is && (c = is.get ()) != std::istream::traits_type::eof () \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4362 && isspace (c)) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4363 { /* skip whitespace */ } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4364 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4365 if (c != std::istream::traits_type::eof ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4366 is.putback (c); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4367 } \
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4368 while (0)
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4369
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4370 #define DO_LITERAL_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4371 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4372 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4373 int c = std::istream::traits_type::eof (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4374 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4375 int n = strlen (fmt); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4376 int i = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4377 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4378 while (i < n && is && (c = is.get ()) != std::istream::traits_type::eof ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4379 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4380 if (c == static_cast<unsigned char> (fmt[i])) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4381 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4382 i++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4383 continue; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4384 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4385 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4386 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4387 is.putback (c); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4388 break; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4389 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4390 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4391 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4392 if (i != n) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4393 is.setstate (std::ios::failbit); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4394 } \
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4395 while (0)
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4396
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4397 #define DO_PCT_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4398 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4399 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4400 int c = is.get (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4401 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4402 if (c != std::istream::traits_type::eof ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4403 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4404 if (c != '%') \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4405 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4406 is.putback (c); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4407 is.setstate (std::ios::failbit); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4408 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4409 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4410 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4411 is.setstate (std::ios::failbit); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4412 } \
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	4413 while (0)
d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	4414
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4415 #define BEGIN_C_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4416 is.unsetf (std::ios::skipws); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4417 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4418 int width = elt->width ? elt->width : 1; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4419 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4420 std::string tmp (width, '\0'); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4421 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4422 int c = std::istream::traits_type::eof (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4423 int n = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4424 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4425 while (is && n < width \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4426 && (c = is.get ()) != std::istream::traits_type::eof ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4427 tmp[n++] = static_cast<char> (c); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4428 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4429 if (n > 0 && c == std::istream::traits_type::eof ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4430 is.clear (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4431 \
12984 7626f8934466 correctly resize scanf output for %c formats (bug #34037) John W. Eaton <jwe@octave.org> parents: 12966 diff changeset	4432 tmp.resize (n)
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4433
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	4434 // For a '%s' format, skip initial whitespace and then read until the
5338 c4b55d47122e [project @ 2005-05-05 17:28:51 by jwe] jwe parents: 5326 diff changeset	4435 // next whitespace character or until WIDTH characters have been read.
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4436 #define BEGIN_S_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4437 int width = elt->width; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4438 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4439 std::string tmp; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4440 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4441 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4442 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4443 if (width) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4444 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4445 tmp = std::string (width, '\0'); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4446 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4447 int c = std::istream::traits_type::eof (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4448 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4449 int n = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4450 \
21184 3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4451 while (is && (c = is.get ()) != std::istream::traits_type::eof ()) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4452 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4453 if (! isspace (c)) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4454 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4455 tmp[n++] = static_cast<char> (c); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4456 break; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4457 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4458 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4459 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4460 while (is && n < width \
21184 3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4461 && (c = is.get ()) != std::istream::traits_type::eof ()) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4462 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4463 if (isspace (c)) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4464 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4465 is.putback (c); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4466 break; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4467 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4468 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4469 tmp[n++] = static_cast<char> (c); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4470 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4471 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4472 if (n > 0 && c == std::istream::traits_type::eof ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4473 is.clear (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4474 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4475 tmp.resize (n); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4476 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4477 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4478 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4479 is >> std::ws >> tmp; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4480 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4481 } \
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4482 while (0)
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4483
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4484 // This format must match a nonempty sequence of characters.
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4485 #define BEGIN_CHAR_CLASS_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4486 int width = elt->width; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4487 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4488 std::string tmp; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4489 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4490 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4491 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4492 if (! width) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4493 width = std::numeric_limits<int>::max (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4494 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4495 std::ostringstream buf; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4496 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4497 std::string char_class = elt->char_class; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4498 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4499 int c = std::istream::traits_type::eof (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4500 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4501 if (elt->type == '[') \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4502 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4503 int chars_read = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4504 while (is && chars_read++ < width \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4505 && (c = is.get ()) != std::istream::traits_type::eof () \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4506 && char_class.find (c) != std::string::npos) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4507 buf << static_cast<char> (c); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4508 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4509 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4510 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4511 int chars_read = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4512 while (is && chars_read++ < width \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4513 && (c = is.get ()) != std::istream::traits_type::eof () \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4514 && char_class.find (c) == std::string::npos) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4515 buf << static_cast<char> (c); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4516 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4517 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4518 if (width == std::numeric_limits<int>::max () \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4519 && c != std::istream::traits_type::eof ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4520 is.putback (c); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4521 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4522 tmp = buf.str (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4523 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4524 if (tmp.empty ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4525 is.setstate (std::ios::failbit); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4526 else if (c == std::istream::traits_type::eof ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4527 is.clear (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4528 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4529 } \
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4530 while (0)
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4531
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4532 #define FINISH_CHARACTER_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4533 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4534 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4535 width = tmp.length (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4536 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4537 if (is) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4538 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4539 int i = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4540 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4541 if (! discard) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4542 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4543 conversion_count++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4544 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4545 while (i < width) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4546 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4547 if (data_index == max_size) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4548 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4549 max_size *= 2; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4550 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4551 if (all_char_conv) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4552 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4553 if (one_elt_size_spec) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4554 mval.resize (1, max_size, 0.0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4555 else if (nr > 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4556 mval.resize (nr, max_size / nr, 0.0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4557 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4558 panic_impossible (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4559 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4560 else if (nr > 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4561 mval.resize (nr, max_size / nr, 0.0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4562 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4563 mval.resize (max_size, 1, 0.0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4564 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4565 data = mval.fortran_vec (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4566 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4567 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4568 data[data_index++] = tmp[i++]; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4569 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4570 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4571 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4572 } \
3410 ee5f222025c3 [project @ 2000-01-07 04:19:05 by jwe] jwe parents: 3342 diff changeset	4573 while (0)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4574
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4575 octave_value
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4576 octave_base_stream::do_scanf (scanf_format_list& fmt_list,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4577 octave_idx_type nr, octave_idx_type nc,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4578 bool one_elt_size_spec,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4579 octave_idx_type& conversion_count,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4580 const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4581 {
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	4582 if (octave::application::interactive () && file_number () == 0)
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4583 ::error ("%s: unable to read from stdin while running interactively",
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4584 who.c_str ());
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4585
8773 9e3111d203c0 disallow reading from stdin while running interactively John W. Eaton <jwe@octave.org> parents: 8739 diff changeset	4586 octave_value retval = Matrix ();
9e3111d203c0 disallow reading from stdin while running interactively John W. Eaton <jwe@octave.org> parents: 8739 diff changeset	4587
3268 fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	4588 conversion_count = 0;
fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	4589
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4590 octave_idx_type nconv = fmt_list.num_conversions ();
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	4591
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5266 diff changeset	4592 octave_idx_type data_index = 0;
2121 bc6ecd8f1175 [project @ 1996-05-12 06:45:55 by jwe] jwe parents: 2117 diff changeset	4593
3268 fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	4594 if (nr == 0 \|\| nc == 0)
fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	4595 {
fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	4596 if (one_elt_size_spec)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4597 nc = 0;
3268 fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	4598
fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	4599 return Matrix (nr, nc, 0.0);
fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	4600 }
fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	4601
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	4602 std::istream *isp = input_stream ();
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4603
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4604 bool all_char_conv = fmt_list.all_character_conversions ();
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4605
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4606 Matrix mval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4607 double *data = 0;
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5266 diff changeset	4608 octave_idx_type max_size = 0;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5266 diff changeset	4609 octave_idx_type max_conv = 0;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5266 diff changeset	4610
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5266 diff changeset	4611 octave_idx_type final_nr = 0;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5266 diff changeset	4612 octave_idx_type final_nc = 0;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4613
3268 fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	4614 if (all_char_conv)
fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	4615 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4616 // Any of these could be resized later (if we have %s conversions,
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4617 // we may read more than one element for each conversion).
3268 fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	4618 if (one_elt_size_spec)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4619 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4620 max_size = 512;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4621 mval.resize (1, max_size, 0.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4622
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4623 if (nr > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4624 max_conv = nr;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4625 }
4420 3dfdbcaf4582 [project @ 2003-05-28 18:24:42 by jwe] jwe parents: 4326 diff changeset	4626 else if (nr > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4627 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4628 if (nc > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4629 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4630 mval.resize (nr, nc, 0.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4631 max_size = max_conv = nr * nc;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4632 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4633 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4634 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4635 mval.resize (nr, 32, 0.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4636 max_size = nr * 32;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4637 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4638 }
4420 3dfdbcaf4582 [project @ 2003-05-28 18:24:42 by jwe] jwe parents: 4326 diff changeset	4639 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4640 panic_impossible ();
3268 fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	4641 }
fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	4642 else if (nr > 0)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4643 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4644 if (nc > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4645 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4646 // Will not resize later.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4647 mval.resize (nr, nc, 0.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4648 max_size = nr * nc;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4649 max_conv = max_size;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4650 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4651 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4652 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4653 // Maybe resize later.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4654 mval.resize (nr, 32, 0.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4655 max_size = nr * 32;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4656 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4657 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4658 else
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4659 {
4420 3dfdbcaf4582 [project @ 2003-05-28 18:24:42 by jwe] jwe parents: 4326 diff changeset	4660 // Maybe resize later.
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4661 mval.resize (32, 1, 0.0);
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4662 max_size = 32;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4663 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4664
4420 3dfdbcaf4582 [project @ 2003-05-28 18:24:42 by jwe] jwe parents: 4326 diff changeset	4665 data = mval.fortran_vec ();
3dfdbcaf4582 [project @ 2003-05-28 18:24:42 by jwe] jwe parents: 4326 diff changeset	4666
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4667 if (isp)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4668 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	4669 std::istream& is = *isp;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4670
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4671 const scanf_format_elt *elt = fmt_list.first ();
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4672
3538 0ff7323dab8b [project @ 2000-02-02 12:36:25 by jwe] jwe parents: 3536 diff changeset	4673 std::ios::fmtflags flags = is.flags ();
2213 c4a887694274 [project @ 1996-05-16 04:13:28 by jwe] jwe parents: 2127 diff changeset	4674
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4675 octave_idx_type trips = 0;
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4676
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4677 octave_idx_type num_fmt_elts = fmt_list.length ();
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4678
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4679 for (;;)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4680 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4681 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4682
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4683 if (elt)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4684 {
20465 44eb1102f8a8 don't recycle scanf format string if all conversions are done (bug #45808) John W. Eaton <jwe@octave.org> parents: 20432 diff changeset	4685 if (elt->type == scanf_format_elt::null
44eb1102f8a8 don't recycle scanf format string if all conversions are done (bug #45808) John W. Eaton <jwe@octave.org> parents: 20432 diff changeset	4686 \|\| (! (elt->type == scanf_format_elt::whitespace_conversion
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	4687 \|\| elt->type == scanf_format_elt::literal_conversion
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	4688 \|\| elt->type == '%')
20465 44eb1102f8a8 don't recycle scanf format string if all conversions are done (bug #45808) John W. Eaton <jwe@octave.org> parents: 20432 diff changeset	4689 && max_conv > 0 && conversion_count == max_conv))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4690 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4691 // We are done, either because we have reached the end of the
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4692 // format string and are not cycling through the format again
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4693 // or because we've converted all the values that have been
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4694 // requested and the next format element is a conversion.
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4695 // Determine final array size and exit.
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4696 if (all_char_conv && one_elt_size_spec)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4697 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4698 final_nr = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4699 final_nc = data_index;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4700 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4701 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4702 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4703 final_nr = nr;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4704 final_nc = (data_index - 1) / nr + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4705 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4706
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4707 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4708 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4709 else if (data_index == max_size)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4710 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4711 max_size *= 2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4712
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4713 if (all_char_conv)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4714 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4715 if (one_elt_size_spec)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4716 mval.resize (1, max_size, 0.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4717 else if (nr > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4718 mval.resize (nr, max_size / nr, 0.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4719 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4720 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4721 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4722 else if (nr > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4723 mval.resize (nr, max_size / nr, 0.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4724 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4725 mval.resize (max_size, 1, 0.0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4726
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4727 data = mval.fortran_vec ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4728 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4729
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4730 const char *fmt = elt->text;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4731
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4732 bool discard = elt->discard;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4733
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4734 switch (elt->type)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4735 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4736 case scanf_format_elt::whitespace_conversion:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4737 DO_WHITESPACE_CONVERSION ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4738 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4739
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4740 case scanf_format_elt::literal_conversion:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4741 DO_LITERAL_CONVERSION ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4742 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4743
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4744 case '%':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4745 DO_PCT_CONVERSION ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4746 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4747
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4748 case 'd': case 'i':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4749 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4750 switch (elt->modifier)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4751 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4752 case 'h':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4753 {
21686 f07d6f579214 scanf: use appropriate sized types for integer conversions (bug #47741) Mike Miller <mtmiller@octave.org> parents: 21622 diff changeset	4754 int16_t tmp;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4755 do_scanf_conv (is, *elt, &tmp, mval, data,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4756 data_index, conversion_count,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4757 nr, max_size, discard);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4758 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4759 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4760
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4761 case 'l':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4762 {
21686 f07d6f579214 scanf: use appropriate sized types for integer conversions (bug #47741) Mike Miller <mtmiller@octave.org> parents: 21622 diff changeset	4763 int64_t tmp;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4764 do_scanf_conv (is, *elt, &tmp, mval, data,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4765 data_index, conversion_count,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4766 nr, max_size, discard);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4767 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4768 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4769
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4770 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4771 {
21686 f07d6f579214 scanf: use appropriate sized types for integer conversions (bug #47741) Mike Miller <mtmiller@octave.org> parents: 21622 diff changeset	4772 int32_t tmp;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4773 do_scanf_conv (is, *elt, &tmp, mval, data,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4774 data_index, conversion_count,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4775 nr, max_size, discard);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4776 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4777 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4778 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4779 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4780 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4781
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4782 case 'o': case 'u': case 'x':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4783 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4784 switch (elt->modifier)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4785 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4786 case 'h':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4787 {
21686 f07d6f579214 scanf: use appropriate sized types for integer conversions (bug #47741) Mike Miller <mtmiller@octave.org> parents: 21622 diff changeset	4788 uint16_t tmp;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4789 do_scanf_conv (is, *elt, &tmp, mval, data,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4790 data_index, conversion_count,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4791 nr, max_size, discard);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4792 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4793 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4794
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4795 case 'l':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4796 {
21686 f07d6f579214 scanf: use appropriate sized types for integer conversions (bug #47741) Mike Miller <mtmiller@octave.org> parents: 21622 diff changeset	4797 uint64_t tmp;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4798 do_scanf_conv (is, *elt, &tmp, mval, data,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4799 data_index, conversion_count,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4800 nr, max_size, discard);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4801 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4802 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4803
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4804 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4805 {
21686 f07d6f579214 scanf: use appropriate sized types for integer conversions (bug #47741) Mike Miller <mtmiller@octave.org> parents: 21622 diff changeset	4806 uint32_t tmp;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4807 do_scanf_conv (is, *elt, &tmp, mval, data,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4808 data_index, conversion_count,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4809 nr, max_size, discard);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4810 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4811 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4812 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4813 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4814 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4815
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4816 case 'e': case 'f': case 'g':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4817 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4818 double tmp;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4819
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4820 do_scanf_conv (is, *elt, &tmp, mval, data,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4821 data_index, conversion_count,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4822 nr, max_size, discard);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4823 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4824 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4825
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4826 case 'c':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4827 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4828 BEGIN_C_CONVERSION ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4829
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4830 FINISH_CHARACTER_CONVERSION ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4831
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4832 is.setf (flags);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4833 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4834 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4835
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4836 case 's':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4837 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4838 BEGIN_S_CONVERSION ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4839
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4840 FINISH_CHARACTER_CONVERSION ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4841 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4842 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4843
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4844 case '[': case '^':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4845 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4846 BEGIN_CHAR_CLASS_CONVERSION ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4847
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4848 FINISH_CHARACTER_CONVERSION ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4849 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4850 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4851
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4852 case 'p':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4853 error ("%s: unsupported format specifier", who.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4854 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4855
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4856 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4857 error ("%s: internal format error", who.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4858 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4859 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4860
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4861 if (! ok ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4862 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4863 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4864 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4865 else if (! is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4866 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4867 if (all_char_conv)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4868 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4869 if (one_elt_size_spec)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4870 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4871 final_nr = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4872 final_nc = data_index;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4873 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4874 else if (data_index > nr)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4875 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4876 final_nr = nr;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4877 final_nc = (data_index - 1) / nr + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4878 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4879 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4880 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4881 final_nr = data_index;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4882 final_nc = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4883 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4884 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4885 else if (nr > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4886 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4887 if (data_index > nr)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4888 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4889 final_nr = nr;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4890 final_nc = (data_index - 1) / nr + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4891 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4892 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4893 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4894 final_nr = data_index;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4895 final_nc = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4896 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4897 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4898 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4899 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4900 final_nr = data_index;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4901 final_nc = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4902 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4903
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4904 // If it looks like we have a matching failure, then
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4905 // reset the failbit in the stream state.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4906 if (is.rdstate () & std::ios::failbit)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4907 is.clear (is.rdstate () & (~std::ios::failbit));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4908
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4909 // FIXME: is this the right thing to do?
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	4910 if (octave::application::interactive ()
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	4911 && ! octave::application::forced_interactive ()
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	4912 && name () == "stdin")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4913 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4914 is.clear ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4915
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4916 // Skip to end of line.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4917 bool err;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4918 do_gets (-1, err, false, who);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4919 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4920
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4921 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4922 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4923 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4924 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4925 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4926 error ("%s: internal format error", who.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4927 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4928 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4929
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4930 if (nconv == 0 && ++trips == num_fmt_elts)
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4931 {
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4932 if (all_char_conv && one_elt_size_spec)
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4933 {
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4934 final_nr = 1;
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4935 final_nc = data_index;
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4936 }
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4937 else
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4938 {
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4939 final_nr = nr;
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4940 final_nc = (data_index - 1) / nr + 1;
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4941 }
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4942
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4943 break;
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4944 }
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4945 else
20465 44eb1102f8a8 don't recycle scanf format string if all conversions are done (bug #45808) John W. Eaton <jwe@octave.org> parents: 20432 diff changeset	4946 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4947 // Cycle through the format list more than once if we have some
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4948 // conversions to make and we haven't reached the limit on the
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4949 // number of values to convert (possibly because there is no
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4950 // specified limit).
20465 44eb1102f8a8 don't recycle scanf format string if all conversions are done (bug #45808) John W. Eaton <jwe@octave.org> parents: 20432 diff changeset	4951 elt = fmt_list.next (nconv > 0
44eb1102f8a8 don't recycle scanf format string if all conversions are done (bug #45808) John W. Eaton <jwe@octave.org> parents: 20432 diff changeset	4952 && (max_conv == 0
44eb1102f8a8 don't recycle scanf format string if all conversions are done (bug #45808) John W. Eaton <jwe@octave.org> parents: 20432 diff changeset	4953 \|\| conversion_count < max_conv));
44eb1102f8a8 don't recycle scanf format string if all conversions are done (bug #45808) John W. Eaton <jwe@octave.org> parents: 20432 diff changeset	4954 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4955 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4956 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4957
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4958 if (ok ())
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4959 {
2121 bc6ecd8f1175 [project @ 1996-05-12 06:45:55 by jwe] jwe parents: 2117 diff changeset	4960 mval.resize (final_nr, final_nc, 0.0);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4961
3268 fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	4962 retval = mval;
fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	4963
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4964 if (all_char_conv)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4965 retval = retval.convert_to_str (false, true);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4966 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4967
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4968 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4969 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4970
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4971 octave_value
3810 f19f00339363 [project @ 2001-03-29 21:03:01 by jwe] jwe parents: 3779 diff changeset	4972 octave_base_stream::scanf (const std::string& fmt, const Array<double>& size,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4973 octave_idx_type& conversion_count,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4974 const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4975 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4976 octave_value retval = Matrix ();
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4977
3559 12d7ec415f35 [project @ 2000-02-03 05:17:36 by jwe] jwe parents: 3553 diff changeset	4978 conversion_count = 0;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4979
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	4980 std::istream *isp = input_stream ();
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4981
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4982 if (! isp)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4983 invalid_operation (who, "reading");
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4984 else
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4985 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4986 scanf_format_list fmt_list (fmt);
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4987
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	4988 if (fmt_list.num_conversions () == -1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4989 ::error ("%s: invalid format specified", who.c_str ());
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4990
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4991 octave_idx_type nr = -1;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4992 octave_idx_type nc = -1;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4993
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4994 bool one_elt_size_spec;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4995
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4996 get_size (size, nr, nc, one_elt_size_spec, who);
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4997
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4998 retval = do_scanf (fmt_list, nr, nc, one_elt_size_spec,
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	4999 conversion_count, who);
2215 ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5000 }
2572 5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5001
5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5002 return retval;
5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5003 }
5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5004
2712 2ff2b536cc9d [project @ 1997-02-21 21:38:21 by jwe] jwe parents: 2687 diff changeset	5005 bool
2ff2b536cc9d [project @ 1997-02-21 21:38:21 by jwe] jwe parents: 2687 diff changeset	5006 octave_base_stream::do_oscanf (const scanf_format_elt *elt,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5007 octave_value& retval, const std::string& who)
2572 5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5008 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5009 std::istream *isp = input_stream ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5010
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5011 if (! isp)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5012 return false;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5013
2712 2ff2b536cc9d [project @ 1997-02-21 21:38:21 by jwe] jwe parents: 2687 diff changeset	5014 bool quit = false;
2215 ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5015
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5016 std::istream& is = *isp;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5017
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5018 std::ios::fmtflags flags = is.flags ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5019
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5020 if (elt)
2215 ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5021 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5022 const char *fmt = elt->text;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5023
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5024 bool discard = elt->discard;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5025
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5026 switch (elt->type)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5027 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5028 case scanf_format_elt::whitespace_conversion:
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5029 DO_WHITESPACE_CONVERSION ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5030 break;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5031
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5032 case scanf_format_elt::literal_conversion:
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5033 DO_LITERAL_CONVERSION ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5034 break;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5035
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5036 case '%':
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5037 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5038 DO_PCT_CONVERSION ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5039
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5040 if (! is)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5041 quit = true;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5042 }
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5043 break;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5044
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5045 case 'd': case 'i':
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5046 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5047 int tmp;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5048
21147 95feb42d7a97 * oct-stream.cc (OCTAVE_SCAN): Eliminate trivial macro. John W. Eaton <jwe@octave.org> parents: 21139 diff changeset	5049 if (octave_scan (is, *elt, &tmp))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5050 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5051 if (! discard)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5052 retval = tmp;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5053 }
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5054 else
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5055 quit = true;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5056 }
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5057 break;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5058
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5059 case 'o': case 'u': case 'x':
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5060 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5061 long int tmp;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5062
21147 95feb42d7a97 * oct-stream.cc (OCTAVE_SCAN): Eliminate trivial macro. John W. Eaton <jwe@octave.org> parents: 21139 diff changeset	5063 if (octave_scan (is, *elt, &tmp))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5064 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5065 if (! discard)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5066 retval = tmp;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5067 }
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5068 else
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5069 quit = true;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5070 }
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5071 break;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5072
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5073 case 'e': case 'f': case 'g':
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5074 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5075 double tmp;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5076
21147 95feb42d7a97 * oct-stream.cc (OCTAVE_SCAN): Eliminate trivial macro. John W. Eaton <jwe@octave.org> parents: 21139 diff changeset	5077 if (octave_scan (is, *elt, &tmp))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5078 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5079 if (! discard)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5080 retval = tmp;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5081 }
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5082 else
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5083 quit = true;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5084 }
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5085 break;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5086
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5087 case 'c':
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5088 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5089 BEGIN_C_CONVERSION ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5090
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5091 if (! discard)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5092 retval = tmp;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5093
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5094 if (! is)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5095 quit = true;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5096
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5097 is.setf (flags);
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5098 }
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5099 break;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5100
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5101 case 's':
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5102 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5103 BEGIN_S_CONVERSION ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5104
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5105 if (! discard)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5106 retval = tmp;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5107
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5108 if (! is)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5109 quit = true;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5110 }
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5111 break;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5112
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5113 case '[':
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5114 case '^':
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5115 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5116 BEGIN_CHAR_CLASS_CONVERSION ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5117
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5118 if (! discard)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5119 retval = tmp;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5120
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5121 if (! is)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5122 quit = true;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5123 }
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5124 break;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5125
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5126 case 'p':
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5127 error ("%s: unsupported format specifier", who.c_str ());
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5128 break;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5129
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5130 default:
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5131 error ("%s: internal format error", who.c_str ());
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5132 break;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5133 }
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5134 }
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5135
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5136 if (ok () && is.fail ())
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5137 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5138 error ("%s: read error", who.c_str ());
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5139
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5140 // FIXME: is this the right thing to do?
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5141
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	5142 if (octave::application::interactive ()
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	5143 && ! octave::application::forced_interactive ()
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	5144 && name () == "stdin")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5145 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5146 // Skip to end of line.
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5147 bool err;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5148 do_gets (-1, err, false, who);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5149 }
2215 ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5150 }
ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5151
2712 2ff2b536cc9d [project @ 1997-02-21 21:38:21 by jwe] jwe parents: 2687 diff changeset	5152 return quit;
2215 ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5153 }
ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5154
ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5155 octave_value_list
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	5156 octave_base_stream::oscanf (const std::string& fmt, const std::string& who)
2215 ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5157 {
ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5158 octave_value_list retval;
ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5159
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	5160 std::istream *isp = input_stream ();
2215 ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5161
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5162 if (! isp)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5163 invalid_operation (who, "reading");
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5164 else
2215 ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5165 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	5166 std::istream& is = *isp;
2215 ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5167
ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5168 scanf_format_list fmt_list (fmt);
ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5169
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	5170 octave_idx_type nconv = fmt_list.num_conversions ();
2215 ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5171
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	5172 if (nconv == -1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5173 ::error ("%s: invalid format specified", who.c_str ());
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5174
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5175 is.clear ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5176
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5177 octave_idx_type len = fmt_list.length ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5178
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5179 retval.resize (nconv+2, Matrix ());
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5180
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5181 const scanf_format_elt *elt = fmt_list.first ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5182
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5183 int num_values = 0;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5184
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5185 bool quit = false;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5186
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5187 for (octave_idx_type i = 0; i < len; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5188 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5189 octave_value tmp;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5190
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5191 quit = do_oscanf (elt, tmp, who);
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5192
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5193 if (quit)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5194 break;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5195 else
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5196 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5197 if (tmp.is_defined ())
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5198 retval(num_values++) = tmp;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5199
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5200 if (! ok ())
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5201 break;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5202
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5203 elt = fmt_list.next (nconv > 0);
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5204 }
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5205 }
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5206
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5207 retval(nconv) = num_values;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5208
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5209 int err_num;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5210 retval(nconv+1) = error (false, err_num);
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5211
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5212 if (! quit)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5213 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5214 // Pick up any trailing stuff.
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5215 if (ok () && len > nconv)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5216 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5217 octave_value tmp;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5218
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5219 elt = fmt_list.next ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5220
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5221 do_oscanf (elt, tmp, who);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5222 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5223 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5224 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5225
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5226 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5227 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5228
21503 20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5229 octave_value
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5230 octave_base_stream::do_textscan (const std::string& fmt,
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5231 octave_idx_type ntimes,
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5232 const octave_value_list& options,
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5233 const std::string& who,
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5234 octave_idx_type& read_count)
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5235 {
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	5236 if (octave::application::interactive () && file_number () == 0)
21503 20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5237 ::error ("%s: unable to read from stdin while running interactively",
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5238 who.c_str ());
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5239
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5240 octave_value retval = Cell (dim_vector (1, 1), Matrix (0, 1));
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5241
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5242 std::istream *isp = input_stream ();
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5243
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5244 if (! isp)
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5245 invalid_operation (who, "reading");
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5246 else
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5247 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	5248 octave::textscan scanner (who);
21503 20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5249
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5250 retval = scanner.scan (*isp, fmt, ntimes, options, read_count);
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5251 }
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5252
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5253 return retval;
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5254 }
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	5255
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5256 // Functions that are defined for all output streams
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5257 // (output streams are those that define os).
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5258
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5259 int
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5260 octave_base_stream::flush (void)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5261 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5262 int retval = -1;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5263
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	5264 std::ostream *os = output_stream ();
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5265
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5266 if (! os)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5267 invalid_operation ("fflush", "writing");
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5268 else
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5269 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5270 os->flush ();
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5271
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5272 if (os->good ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5273 retval = 0;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5274 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5275
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5276 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5277 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5278
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5279 class
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5280 printf_value_cache
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5281 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5282 public:
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5283
3653 84b2f30007d5 [project @ 2000-03-31 23:33:25 by jwe] jwe parents: 3645 diff changeset	5284 enum state { ok, conversion_error };
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5285
7352 fab9bc33b949 [project @ 2008-01-07 18:54:45 by jwe] jwe parents: 7227 diff changeset	5286 printf_value_cache (const octave_value_list& args, const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5287 : values (args), val_idx (0), elt_idx (0),
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5288 n_vals (values.length ()), n_elts (0), have_data (false),
7352 fab9bc33b949 [project @ 2008-01-07 18:54:45 by jwe] jwe parents: 7227 diff changeset	5289 curr_state (ok)
fab9bc33b949 [project @ 2008-01-07 18:54:45 by jwe] jwe parents: 7227 diff changeset	5290 {
fab9bc33b949 [project @ 2008-01-07 18:54:45 by jwe] jwe parents: 7227 diff changeset	5291 for (octave_idx_type i = 0; i < values.length (); i++)
fab9bc33b949 [project @ 2008-01-07 18:54:45 by jwe] jwe parents: 7227 diff changeset	5292 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5293 octave_value val = values(i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5294
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5295 if (val.is_map () \|\| val.is_cell () \|\| val.is_object ())
21129 228b65504557 maint: Eliminate useless statements after err_XXX. Rik <rik@octave.org> parents: 21114 diff changeset	5296 err_wrong_type_arg (who, val);
7352 fab9bc33b949 [project @ 2008-01-07 18:54:45 by jwe] jwe parents: 7227 diff changeset	5297 }
fab9bc33b949 [project @ 2008-01-07 18:54:45 by jwe] jwe parents: 7227 diff changeset	5298 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5299
22868 87e3163f6c87 use c++11 "= default" syntax for declaration of trivial destructors John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	5300 ~printf_value_cache (void) = default;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5301
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5302 // Get the current value as a double and advance the internal pointer.
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5303 octave_value get_next_value (char type = 0);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5304
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5305 // Get the current value as an int and advance the internal pointer.
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5306 int int_value (void);
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5307
3145 0d640dc625c7 [project @ 1998-02-05 08:44:59 by jwe] jwe parents: 3013 diff changeset	5308 operator bool () const { return (curr_state == ok); }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5309
3653 84b2f30007d5 [project @ 2000-03-31 23:33:25 by jwe] jwe parents: 3645 diff changeset	5310 bool exhausted (void) { return (val_idx >= n_vals); }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5311
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5312 private:
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5313
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5314 const octave_value_list values;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5315 int val_idx;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5316 int elt_idx;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5317 int n_vals;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5318 int n_elts;
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5319 bool have_data;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5320 octave_value curr_val;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5321 state curr_state;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5322
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5323 // Must create value cache with values!
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5324
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5325 printf_value_cache (void);
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5326
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5327 // No copying!
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5328
22865 89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	5329 printf_value_cache (const printf_value_cache&) = delete;
89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	5330
89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	5331 printf_value_cache& operator = (const printf_value_cache&) = delete;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5332 };
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5333
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5334 octave_value
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5335 printf_value_cache::get_next_value (char type)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5336 {
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5337 octave_value retval;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5338
3711 60db0e500f10 [project @ 2000-08-03 05:09:39 by jwe] jwe parents: 3704 diff changeset	5339 if (exhausted ())
60db0e500f10 [project @ 2000-08-03 05:09:39 by jwe] jwe parents: 3704 diff changeset	5340 curr_state = conversion_error;
60db0e500f10 [project @ 2000-08-03 05:09:39 by jwe] jwe parents: 3704 diff changeset	5341
60db0e500f10 [project @ 2000-08-03 05:09:39 by jwe] jwe parents: 3704 diff changeset	5342 while (! exhausted ())
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5343 {
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5344 if (! have_data)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5345 {
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5346 curr_val = values (val_idx);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5347
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	5348 elt_idx = 0;
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	5349 n_elts = curr_val.numel ();
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	5350 have_data = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5351 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5352
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5353 if (elt_idx < n_elts)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5354 {
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5355 if (type == 's')
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5356 {
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5357 if (curr_val.is_string ())
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5358 {
21296 596e19e7e571 fix printf regression (bug #47192) John W. Eaton <jwe@octave.org> parents: 21235 diff changeset	5359 dim_vector dv (1, curr_val.numel ());
596e19e7e571 fix printf regression (bug #47192) John W. Eaton <jwe@octave.org> parents: 21235 diff changeset	5360 octave_value tmp = curr_val.reshape (dv);
596e19e7e571 fix printf regression (bug #47192) John W. Eaton <jwe@octave.org> parents: 21235 diff changeset	5361
596e19e7e571 fix printf regression (bug #47192) John W. Eaton <jwe@octave.org> parents: 21235 diff changeset	5362 std::string sval = tmp.string_value ();
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5363
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5364 retval = sval.substr (elt_idx);
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5365
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5366 // We've consumed the rest of the value.
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5367 elt_idx = n_elts;
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5368 }
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5369 else
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5370 {
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5371 // Convert to character string while values are
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5372 // integers in the range [0 : char max]
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5373 const NDArray val = curr_val.array_value ();
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5374
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5375 octave_idx_type idx = elt_idx;
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5376
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5377 for (; idx < n_elts; idx++)
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5378 {
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5379 double dval = val(idx);
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5380
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21777 diff changeset	5381 if (octave::math::x_nint (dval) != dval \|\| dval < 0 \|\| dval > 255)
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5382 break;
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5383 }
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5384
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5385 octave_idx_type n = idx - elt_idx;
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5386
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5387 if (n > 0)
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5388 {
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5389 std::string sval (n, '\0');
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5390
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5391 for (octave_idx_type i = 0; i < n; i++)
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5392 sval[i] = val(elt_idx++);
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5393
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5394 retval = sval;
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5395 }
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5396 else
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5397 retval = curr_val.fast_elem_extract (elt_idx++);
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5398 }
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5399 }
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5400 else
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5401 {
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5402 retval = curr_val.fast_elem_extract (elt_idx++);
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5403
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5404 if (type == 'c' && ! retval.is_string ())
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5405 {
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5406 double dval = retval.double_value ();
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5407
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21777 diff changeset	5408 if (octave::math::x_nint (dval) == dval && dval >= 0 && dval < 256)
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5409 retval = static_cast<char> (dval);
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5410 }
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5411 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5412
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5413 if (elt_idx >= n_elts)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5414 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5415 elt_idx = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5416 val_idx++;
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5417 have_data = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5418 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5419
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5420 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5421 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5422 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5423 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5424 val_idx++;
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5425 have_data = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5426
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5427 if (n_elts == 0)
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5428 {
22812 86b6f79d4de1 better compatibility for printf with empty args (bug #39375) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	5429 if (elt_idx == 0)
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5430 {
22812 86b6f79d4de1 better compatibility for printf with empty args (bug #39375) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	5431 if (type == 's' \|\| type == 'c')
86b6f79d4de1 better compatibility for printf with empty args (bug #39375) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	5432 retval = "";
86b6f79d4de1 better compatibility for printf with empty args (bug #39375) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	5433 else
86b6f79d4de1 better compatibility for printf with empty args (bug #39375) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	5434 retval = Matrix ();
86b6f79d4de1 better compatibility for printf with empty args (bug #39375) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	5435
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5436 break;
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5437 }
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5438
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5439 if (exhausted ())
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5440 curr_state = conversion_error;
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5441 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5442 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5443 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5444
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5445 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5446 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5447
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5448 int
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5449 printf_value_cache::int_value (void)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5450 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5451 int retval = 0;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5452
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5453 octave_value val = get_next_value ();
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5454
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20465 diff changeset	5455 double dval = val.double_value (true);
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20465 diff changeset	5456
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21777 diff changeset	5457 if (octave::math::x_nint (dval) == dval)
2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21777 diff changeset	5458 retval = octave::math::nint (dval);
20704 571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	5459 else
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	5460 curr_state = conversion_error;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5461
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5462 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5463 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5464
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5465 // Ugh again and again.
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5466
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	5467 template <typename T>
3620 0886bbb236cb [project @ 2000-03-23 05:17:23 by jwe] jwe parents: 3559 diff changeset	5468 int
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	5469 do_printf_conv (std::ostream& os, const char *fmt, int nsa, int sa_1,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5470 int sa_2, T arg, const std::string& who)
2572 5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5471 {
3620 0886bbb236cb [project @ 2000-03-23 05:17:23 by jwe] jwe parents: 3559 diff changeset	5472 int retval = 0;
0886bbb236cb [project @ 2000-03-23 05:17:23 by jwe] jwe parents: 3559 diff changeset	5473
2572 5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5474 switch (nsa)
5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5475 {
5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5476 case 2:
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	5477 retval = octave_format (os, fmt, sa_1, sa_2, arg);
2572 5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5478 break;
5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5479
5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5480 case 1:
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	5481 retval = octave_format (os, fmt, sa_1, arg);
2572 5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5482 break;
5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5483
5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5484 case 0:
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	5485 retval = octave_format (os, fmt, arg);
2572 5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5486 break;
5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5487
5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5488 default:
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	5489 ::error ("%s: internal error handling format", who.c_str ());
2572 5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5490 break;
5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5491 }
3620 0886bbb236cb [project @ 2000-03-23 05:17:23 by jwe] jwe parents: 3559 diff changeset	5492
0886bbb236cb [project @ 2000-03-23 05:17:23 by jwe] jwe parents: 3559 diff changeset	5493 return retval;
2572 5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5494 }
5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5495
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5496 static size_t
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5497 do_printf_string (std::ostream& os, const printf_format_elt *elt,
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5498 int nsa, int sa_1, int sa_2, const std::string& arg,
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5499 const std::string& who)
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5500 {
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5501 if (nsa > 2)
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20768 diff changeset	5502 ::error ("%s: internal error handling format", who.c_str ());
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5503
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5504 std::string flags = elt->flags;
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5505
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5506 bool left = flags.find ('-') != std::string::npos;
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5507
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5508 size_t len = arg.length ();
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5509
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5510 size_t fw = nsa > 0 ? sa_1 : (elt->fw == -1 ? len : elt->fw);
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5511 size_t prec = nsa > 1 ? sa_2 : (elt->prec == -1 ? len : elt->prec);
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5512
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5513 os << std::setw (fw)
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5514 << (left ? std::left : std::right)
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5515 << (prec < len ? arg.substr (0, prec) : arg);
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5516
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5517 return len > fw ? len : fw;
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5518 }
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5519
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5520 static bool
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5521 is_nan_or_inf (const octave_value& val)
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5522 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5523 octave_value ov_isnan = val.isnan ();
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5524 octave_value ov_isinf = val.isinf ();
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5525
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5526 return (ov_isnan.is_true () \|\| ov_isinf.is_true ());
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5527 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5528
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5529 static bool
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5530 ok_for_signed_int_conv (const octave_value& val)
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5531 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5532 uint64_t limit = std::numeric_limits<int64_t>::max ();
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5533
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5534 if (val.is_string ())
20252 7fa170cc14fe Return correct hex value for printf when used with string inputs (bug #45263). John W. Eaton <jwe@octave.org> parents: 19864 diff changeset	5535 return true;
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5536 else if (val.is_integer_type ())
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5537 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5538 if (val.is_uint64_type ())
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5539 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5540 octave_uint64 ival = val.uint64_scalar_value ();
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5541
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5542 if (ival.value () <= limit)
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5543 return true;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5544 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5545 else
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5546 return true;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5547 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5548 else
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5549 {
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5550 double dval = val.double_value (true);
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5551
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21777 diff changeset	5552 if (dval == octave::math::round (dval) && dval <= limit)
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5553 return true;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5554 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5555
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5556 return false;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5557 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5558
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5559 static bool
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5560 ok_for_unsigned_int_conv (const octave_value& val)
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5561 {
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5562 if (val.is_string ())
20252 7fa170cc14fe Return correct hex value for printf when used with string inputs (bug #45263). John W. Eaton <jwe@octave.org> parents: 19864 diff changeset	5563 return true;
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5564 else if (val.is_integer_type ())
18653 7d0014bb9e4e also switch from unsigned integer to real format for negative values John W. Eaton <jwe@octave.org> parents: 18650 diff changeset	5565 {
7d0014bb9e4e also switch from unsigned integer to real format for negative values John W. Eaton <jwe@octave.org> parents: 18650 diff changeset	5566 // Easier than dispatching here...
7d0014bb9e4e also switch from unsigned integer to real format for negative values John W. Eaton <jwe@octave.org> parents: 18650 diff changeset	5567
7d0014bb9e4e also switch from unsigned integer to real format for negative values John W. Eaton <jwe@octave.org> parents: 18650 diff changeset	5568 octave_value ov_is_ge_zero
7d0014bb9e4e also switch from unsigned integer to real format for negative values John W. Eaton <jwe@octave.org> parents: 18650 diff changeset	5569 = do_binary_op (octave_value::op_ge, val, octave_value (0.0));
7d0014bb9e4e also switch from unsigned integer to real format for negative values John W. Eaton <jwe@octave.org> parents: 18650 diff changeset	5570
7d0014bb9e4e also switch from unsigned integer to real format for negative values John W. Eaton <jwe@octave.org> parents: 18650 diff changeset	5571 return ov_is_ge_zero.is_true ();
7d0014bb9e4e also switch from unsigned integer to real format for negative values John W. Eaton <jwe@octave.org> parents: 18650 diff changeset	5572 }
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5573 else
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5574 {
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5575 double dval = val.double_value (true);
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5576
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5577 uint64_t limit = std::numeric_limits<uint64_t>::max ();
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5578
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21777 diff changeset	5579 if (dval == octave::math::round (dval) && dval >= 0 && dval <= limit)
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5580 return true;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5581 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5582
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5583 return false;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5584 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5585
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5586 static std::string
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5587 switch_to_g_format (const printf_format_elt *elt)
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5588 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5589 std::string tfmt = elt->text;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5590
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5591 tfmt.replace (tfmt.rfind (elt->type), 1, "g");
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5592
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5593 return tfmt;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5594 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5595
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5596 int
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5597 octave_base_stream::do_numeric_printf_conv (std::ostream& os,
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5598 const printf_format_elt *elt,
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5599 int nsa, int sa_1, int sa_2,
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5600 const octave_value& val,
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5601 const std::string& who)
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5602 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5603 int retval = 0;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5604
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5605 const char *fmt = elt->text;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5606
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5607 if (is_nan_or_inf (val))
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5608 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5609 double dval = val.double_value ();
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5610
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5611 std::string tfmt = fmt;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5612 std::string::size_type i1, i2;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5613
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5614 tfmt.replace ((i1 = tfmt.rfind (elt->type)), 1, 1, 's');
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5615
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5616 if ((i2 = tfmt.rfind ('.')) != std::string::npos && i2 < i1)
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5617 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5618 tfmt.erase (i2, i1-i2);
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5619 if (elt->prec == -2)
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5620 nsa--;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5621 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5622
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5623 const char *tval;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5624 if (lo_ieee_isinf (dval))
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5625 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5626 if (elt->flags.find ('+') != std::string::npos)
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5627 tval = (dval < 0 ? "-Inf" : "+Inf");
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5628 else
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5629 tval = (dval < 0 ? "-Inf" : "Inf");
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5630 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5631 else
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5632 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5633 if (elt->flags.find ('+') != std::string::npos)
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5634 tval = (lo_ieee_is_NA (dval) ? "+NA" : "+NaN");
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5635 else
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5636 tval = (lo_ieee_is_NA (dval) ? "NA" : "NaN");
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5637 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5638
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5639 retval += do_printf_conv (os, tfmt.c_str (), nsa, sa_1, sa_2, tval, who);
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5640 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5641 else
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5642 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5643 static std::string llmod
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5644 = sizeof (long) == sizeof (int64_t) ? "l" : "ll";
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5645
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5646 char type = elt->type;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5647
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5648 switch (type)
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5649 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5650 case 'd': case 'i': case 'c':
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5651 if (ok_for_signed_int_conv (val))
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5652 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5653 octave_int64 tval = val.int64_scalar_value ();
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5654
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5655 // Insert "long" modifier.
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5656 std::string tfmt = fmt;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5657 tfmt.replace (tfmt.rfind (type), 1, llmod + type);
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5658
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5659 retval += do_printf_conv (os, tfmt.c_str (), nsa, sa_1, sa_2,
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5660 tval.value (), who);
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5661 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5662 else
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5663 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5664 std::string tfmt = switch_to_g_format (elt);
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5665
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5666 double dval = val.double_value (true);
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5667
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20465 diff changeset	5668 retval += do_printf_conv (os, tfmt.c_str (), nsa,
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20465 diff changeset	5669 sa_1, sa_2, dval, who);
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5670 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5671 break;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5672
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5673 case 'o': case 'x': case 'X': case 'u':
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5674 if (ok_for_unsigned_int_conv (val))
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5675 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5676 octave_uint64 tval = val.uint64_scalar_value ();
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5677
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5678 // Insert "long" modifier.
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5679 std::string tfmt = fmt;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5680 tfmt.replace (tfmt.rfind (type), 1, llmod + type);
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5681
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5682 retval += do_printf_conv (os, tfmt.c_str (), nsa, sa_1, sa_2,
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5683 tval.value (), who);
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5684 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5685 else
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5686 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5687 std::string tfmt = switch_to_g_format (elt);
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5688
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5689 double dval = val.double_value (true);
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5690
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20465 diff changeset	5691 retval += do_printf_conv (os, tfmt.c_str (), nsa,
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20465 diff changeset	5692 sa_1, sa_2, dval, who);
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5693 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5694 break;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5695
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5696 case 'f': case 'e': case 'E':
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5697 case 'g': case 'G':
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5698 {
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5699 double dval = val.double_value (true);
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5700
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20465 diff changeset	5701 retval += do_printf_conv (os, fmt, nsa, sa_1, sa_2, dval, who);
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5702 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5703 break;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5704
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5705 default:
20938 aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	5706 // Note: error is member fcn from octave_base_stream, not ::error.
aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	5707 // This error does not halt execution so "return ..." must exist.
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20768 diff changeset	5708 error ("%s: invalid format specifier", who.c_str ());
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5709 return -1;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5710 break;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5711 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5712 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5713
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5714 return retval;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5715 }
6492 bcfdc9f0d267 [project @ 2007-04-05 06:13:30 by jwe] jwe parents: 6483 diff changeset	5716
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5717 int
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5718 octave_base_stream::do_printf (printf_format_list& fmt_list,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5719 const octave_value_list& args,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5720 const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5721 {
3620 0886bbb236cb [project @ 2000-03-23 05:17:23 by jwe] jwe parents: 3559 diff changeset	5722 int retval = 0;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5723
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	5724 octave_idx_type nconv = fmt_list.num_conversions ();
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	5725
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	5726 std::ostream *osp = output_stream ();
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5727
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5728 if (! osp)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5729 invalid_operation (who, "writing");
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5730 else
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5731 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	5732 std::ostream& os = *osp;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5733
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5734 const printf_format_elt *elt = fmt_list.first ();
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5735
7352 fab9bc33b949 [project @ 2008-01-07 18:54:45 by jwe] jwe parents: 7227 diff changeset	5736 printf_value_cache val_cache (args, who);
fab9bc33b949 [project @ 2008-01-07 18:54:45 by jwe] jwe parents: 7227 diff changeset	5737
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5738 for (;;)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5739 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5740 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5741
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5742 if (! elt)
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5743 ::error ("%s: internal error handling format", who.c_str ());
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5744
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5745 // NSA is the number of 'star' args to convert.
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5746 int nsa = (elt->fw == -2) + (elt->prec == -2);
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5747
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5748 int sa_1 = 0;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5749 int sa_2 = 0;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5750
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5751 if (nsa > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5752 {
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5753 sa_1 = val_cache.int_value ();
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5754
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5755 if (! val_cache)
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5756 break;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5757 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5758 {
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5759 if (nsa > 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5760 {
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5761 sa_2 = val_cache.int_value ();
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5762
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5763 if (! val_cache)
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5764 break;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5765 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5766 }
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5767 }
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5768
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5769 if (elt->type == '%')
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5770 {
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5771 os << "%";
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5772 retval++;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5773 }
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5774 else if (elt->args == 0 && elt->text)
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5775 {
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5776 os << elt->text;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5777 retval += strlen (elt->text);
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5778 }
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5779 else if (elt->type == 's' \|\| elt->type == 'c')
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5780 {
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5781 octave_value val = val_cache.get_next_value (elt->type);
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5782
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5783 if (val_cache)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5784 {
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5785 if (val.is_string ())
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5786 {
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5787 std::string sval = val.string_value ();
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5788
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5789 retval += do_printf_string (os, elt, nsa, sa_1,
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5790 sa_2, sval, who);
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5791 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5792 else
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5793 retval += do_numeric_printf_conv (os, elt, nsa, sa_1,
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5794 sa_2, val, who);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5795 }
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5796 else
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5797 break;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5798 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5799 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5800 {
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5801 octave_value val = val_cache.get_next_value ();
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5802
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5803 if (val_cache)
22812 86b6f79d4de1 better compatibility for printf with empty args (bug #39375) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	5804 {
86b6f79d4de1 better compatibility for printf with empty args (bug #39375) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	5805 if (! val.is_empty ())
86b6f79d4de1 better compatibility for printf with empty args (bug #39375) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	5806 retval += do_numeric_printf_conv (os, elt, nsa, sa_1,
86b6f79d4de1 better compatibility for printf with empty args (bug #39375) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	5807 sa_2, val, who);
86b6f79d4de1 better compatibility for printf with empty args (bug #39375) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	5808 }
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5809 else
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5810 break;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5811 }
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5812
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5813 if (! os)
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5814 {
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	5815 error ("%s: write error", who.c_str ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5816 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5817 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5818
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5819 elt = fmt_list.next (nconv > 0 && ! val_cache.exhausted ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5820
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5821 if (! elt \|\| (val_cache.exhausted () && elt->args > 0))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5822 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11574 diff changeset	5823 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5824 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5825
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5826 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5827 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5828
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5829 int
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	5830 octave_base_stream::printf (const std::string& fmt,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5831 const octave_value_list& args,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5832 const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5833 {
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	5834 printf_format_list fmt_list (fmt);
d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	5835
d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	5836 if (fmt_list.num_conversions () == -1)
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	5837 ::error ("%s: invalid format specified", who.c_str ());
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5838
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5839 return do_printf (fmt_list, args, who);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5840 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5841
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5842 int
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	5843 octave_base_stream::puts (const std::string& s, const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5844 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5845 int retval = -1;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5846
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	5847 std::ostream *osp = output_stream ();
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5848
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5849 if (! osp)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5850 invalid_operation (who, "writing");
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5851 else
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5852 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	5853 std::ostream& os = *osp;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5854
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5855 os << s;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5856
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5857 if (! os)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5858 error ("%s: write error", who.c_str ());
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5859 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5860 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5861 // FIXME: why does this seem to be necessary?
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5862 // Without it, output from a loop like
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5863 //
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5864 // for i = 1:100, fputs (stdout, "foo\n"); endfor
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5865 //
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5866 // doesn't seem to go to the pager immediately.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5867 os.flush ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5868
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5869 if (os)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5870 retval = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5871 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5872 error ("%s: write error", who.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5873 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5874 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5875
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5876 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5877 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5878
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5879 // Return current error message for this stream.
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5880
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3535 diff changeset	5881 std::string
2435 3be97fe02051 [project @ 1996-10-27 21:31:29 by jwe] jwe parents: 2341 diff changeset	5882 octave_base_stream::error (bool clear_err, int& err_num)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5883 {
2435 3be97fe02051 [project @ 1996-10-27 21:31:29 by jwe] jwe parents: 2341 diff changeset	5884 err_num = fail ? -1 : 0;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5885
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	5886 std::string tmp = errmsg;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5887
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5888 if (clear_err)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5889 clear ();
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5890
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5891 return tmp;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5892 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5893
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5894 void
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	5895 octave_base_stream::invalid_operation (const std::string& who, const char *rw)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5896 {
20938 aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	5897 // Note: This calls the member fcn error, not ::error from error.h.
6297 a943cb9c8068 [project @ 2007-02-10 08:42:27 by jwe] jwe parents: 6296 diff changeset	5898 error (who, std::string ("stream not open for ") + rw);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5899 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5900
3552 41daa489833a [project @ 2000-02-03 03:05:28 by jwe] jwe parents: 3548 diff changeset	5901 octave_stream::octave_stream (octave_base_stream *bs)
3340 585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5902 : rep (bs)
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5903 {
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5904 if (rep)
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5905 rep->count = 1;
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5906 }
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5907
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5908 octave_stream::~octave_stream (void)
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5909 {
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5910 if (rep && --rep->count == 0)
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5911 delete rep;
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5912 }
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5913
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5914 octave_stream::octave_stream (const octave_stream& s)
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5915 : rep (s.rep)
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5916 {
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5917 if (rep)
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5918 rep->count++;
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5919 }
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5920
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5921 octave_stream&
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5922 octave_stream::operator = (const octave_stream& s)
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5923 {
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5924 if (rep != s.rep)
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5925 {
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5926 if (rep && --rep->count == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5927 delete rep;
3340 585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5928
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5929 rep = s.rep;
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5930
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5931 if (rep)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5932 rep->count++;
3340 585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5933 }
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5934
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5935 return *this;
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5936 }
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5937
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5938 int
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5939 octave_stream::flush (void)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5940 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5941 int retval = -1;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5942
5659 960f4b9a26af [project @ 2006-03-10 15:35:20 by jwe] jwe parents: 5649 diff changeset	5943 if (stream_ok ())
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5944 retval = rep->flush ();
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5945
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5946 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5947 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5948
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3535 diff changeset	5949 std::string
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5266 diff changeset	5950 octave_stream::getl (octave_idx_type max_len, bool& err, const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5951 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	5952 std::string retval;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5953
5659 960f4b9a26af [project @ 2006-03-10 15:35:20 by jwe] jwe parents: 5649 diff changeset	5954 if (stream_ok ())
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	5955 retval = rep->getl (max_len, err, who);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5956
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5957 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5958 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5959
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3535 diff changeset	5960 std::string
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	5961 octave_stream::getl (const octave_value& tc_max_len, bool& err,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5962 const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5963 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5964 err = false;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5965
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5966 int conv_err = 0;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5967
6345 9e058e5fa8a7 [project @ 2007-02-22 22:22:53 by jwe] jwe parents: 6297 diff changeset	5968 int max_len = -1;
9e058e5fa8a7 [project @ 2007-02-22 22:22:53 by jwe] jwe parents: 6297 diff changeset	5969
9e058e5fa8a7 [project @ 2007-02-22 22:22:53 by jwe] jwe parents: 6297 diff changeset	5970 if (tc_max_len.is_defined ())
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5971 {
6345 9e058e5fa8a7 [project @ 2007-02-22 22:22:53 by jwe] jwe parents: 6297 diff changeset	5972 max_len = convert_to_valid_int (tc_max_len, conv_err);
9e058e5fa8a7 [project @ 2007-02-22 22:22:53 by jwe] jwe parents: 6297 diff changeset	5973
9e058e5fa8a7 [project @ 2007-02-22 22:22:53 by jwe] jwe parents: 6297 diff changeset	5974 if (conv_err \|\| max_len < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5975 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5976 err = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5977 ::error ("%s: invalid maximum length specified", who.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5978 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5979 }
6345 9e058e5fa8a7 [project @ 2007-02-22 22:22:53 by jwe] jwe parents: 6297 diff changeset	5980
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5981 return getl (max_len, err, who);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5982 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5983
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3535 diff changeset	5984 std::string
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5266 diff changeset	5985 octave_stream::gets (octave_idx_type max_len, bool& err, const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5986 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	5987 std::string retval;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5988
5659 960f4b9a26af [project @ 2006-03-10 15:35:20 by jwe] jwe parents: 5649 diff changeset	5989 if (stream_ok ())
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	5990 retval = rep->gets (max_len, err, who);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5991
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5992 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5993 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5994
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3535 diff changeset	5995 std::string
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	5996 octave_stream::gets (const octave_value& tc_max_len, bool& err,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5997 const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5998 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5999 err = false;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6000
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6001 int conv_err = 0;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6002
6345 9e058e5fa8a7 [project @ 2007-02-22 22:22:53 by jwe] jwe parents: 6297 diff changeset	6003 int max_len = -1;
9e058e5fa8a7 [project @ 2007-02-22 22:22:53 by jwe] jwe parents: 6297 diff changeset	6004
9e058e5fa8a7 [project @ 2007-02-22 22:22:53 by jwe] jwe parents: 6297 diff changeset	6005 if (tc_max_len.is_defined ())
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6006 {
6345 9e058e5fa8a7 [project @ 2007-02-22 22:22:53 by jwe] jwe parents: 6297 diff changeset	6007 max_len = convert_to_valid_int (tc_max_len, conv_err);
9e058e5fa8a7 [project @ 2007-02-22 22:22:53 by jwe] jwe parents: 6297 diff changeset	6008
9e058e5fa8a7 [project @ 2007-02-22 22:22:53 by jwe] jwe parents: 6297 diff changeset	6009 if (conv_err \|\| max_len < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6010 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6011 err = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6012 ::error ("%s: invalid maximum length specified", who.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6013 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6014 }
6345 9e058e5fa8a7 [project @ 2007-02-22 22:22:53 by jwe] jwe parents: 6297 diff changeset	6015
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6016 return gets (max_len, err, who);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6017 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6018
16011 8122286c69a9 initial large file support for 32-bit systems John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	6019 off_t
8122286c69a9 initial large file support for 32-bit systems John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	6020 octave_stream::skipl (off_t count, bool& err, const std::string& who)
9701 531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6021 {
16011 8122286c69a9 initial large file support for 32-bit systems John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	6022 off_t retval = -1;
9701 531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6023
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6024 if (stream_ok ())
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6025 retval = rep->skipl (count, err, who);
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6026
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6027 return retval;
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6028 }
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6029
16011 8122286c69a9 initial large file support for 32-bit systems John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	6030 off_t
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6031 octave_stream::skipl (const octave_value& tc_count, bool& err,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6032 const std::string& who)
9701 531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6033 {
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6034 err = false;
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6035
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6036 int conv_err = 0;
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6037
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6038 int count = 1;
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6039
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6040 if (tc_count.is_defined ())
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6041 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	6042 if (tc_count.is_scalar_type ()
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	6043 && octave::math::isinf (tc_count.scalar_value ()))
9701 531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6044 count = -1;
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6045 else
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6046 {
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6047 count = convert_to_valid_int (tc_count, conv_err);
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6048
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6049 if (conv_err \|\| count < 0)
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6050 {
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6051 err = true;
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6052 ::error ("%s: invalid number of lines specified", who.c_str ());
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6053 }
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6054 }
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6055 }
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6056
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6057 return skipl (count, err, who);
9701 531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6058 }
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	6059
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6060 int
16011 8122286c69a9 initial large file support for 32-bit systems John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	6061 octave_stream::seek (off_t offset, int origin)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6062 {
5065 1312d3af9eb0 [project @ 2004-11-04 20:12:00 by jwe] jwe parents: 5030 diff changeset	6063 int status = -1;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6064
5659 960f4b9a26af [project @ 2006-03-10 15:35:20 by jwe] jwe parents: 5649 diff changeset	6065 if (stream_ok ())
4889 658aad1c1b05 [project @ 2004-04-30 22:38:30 by jwe] jwe parents: 4888 diff changeset	6066 {
658aad1c1b05 [project @ 2004-04-30 22:38:30 by jwe] jwe parents: 4888 diff changeset	6067 clearerr ();
658aad1c1b05 [project @ 2004-04-30 22:38:30 by jwe] jwe parents: 4888 diff changeset	6068
12957 fb69561e5901 maint: fix missing line continuation in src/Makefile.am John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	6069 // Find current position so we can return to it if needed.
16011 8122286c69a9 initial large file support for 32-bit systems John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	6070 off_t orig_pos = rep->tell ();
5065 1312d3af9eb0 [project @ 2004-11-04 20:12:00 by jwe] jwe parents: 5030 diff changeset	6071
12957 fb69561e5901 maint: fix missing line continuation in src/Makefile.am John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	6072 // Move to end of file. If successful, find the offset of the end.
fb69561e5901 maint: fix missing line continuation in src/Makefile.am John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	6073 status = rep->seek (0, SEEK_END);
5065 1312d3af9eb0 [project @ 2004-11-04 20:12:00 by jwe] jwe parents: 5030 diff changeset	6074
1312d3af9eb0 [project @ 2004-11-04 20:12:00 by jwe] jwe parents: 5030 diff changeset	6075 if (status == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6076 {
16011 8122286c69a9 initial large file support for 32-bit systems John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	6077 off_t eof_pos = rep->tell ();
12957 fb69561e5901 maint: fix missing line continuation in src/Makefile.am John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	6078
12943 8372d50de75a improve logic of octave_stream::seek funtion John W. Eaton <jwe@octave.org> parents: 12936 diff changeset	6079 if (origin == SEEK_CUR)
8372d50de75a improve logic of octave_stream::seek funtion John W. Eaton <jwe@octave.org> parents: 12936 diff changeset	6080 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6081 // Move back to original position, otherwise we will be seeking
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6082 // from the end of file which is probably not the original
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6083 // location.
12943 8372d50de75a improve logic of octave_stream::seek funtion John W. Eaton <jwe@octave.org> parents: 12936 diff changeset	6084 rep->seek (orig_pos, SEEK_SET);
8372d50de75a improve logic of octave_stream::seek funtion John W. Eaton <jwe@octave.org> parents: 12936 diff changeset	6085 }
8372d50de75a improve logic of octave_stream::seek funtion John W. Eaton <jwe@octave.org> parents: 12936 diff changeset	6086
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6087 // Attempt to move to desired position; may be outside bounds of
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6088 // existing file.
12957 fb69561e5901 maint: fix missing line continuation in src/Makefile.am John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	6089 status = rep->seek (offset, origin);
fb69561e5901 maint: fix missing line continuation in src/Makefile.am John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	6090
fb69561e5901 maint: fix missing line continuation in src/Makefile.am John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	6091 if (status == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6092 {
12957 fb69561e5901 maint: fix missing line continuation in src/Makefile.am John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	6093 // Where are we after moving to desired position?
16011 8122286c69a9 initial large file support for 32-bit systems John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	6094 off_t desired_pos = rep->tell ();
12957 fb69561e5901 maint: fix missing line continuation in src/Makefile.am John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	6095
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6096 // I don't think save_pos can be less than zero,
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6097 // but we'll check anyway...
12957 fb69561e5901 maint: fix missing line continuation in src/Makefile.am John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	6098 if (desired_pos > eof_pos \|\| desired_pos < 0)
fb69561e5901 maint: fix missing line continuation in src/Makefile.am John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	6099 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6100 // Seek outside bounds of file.
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6101 // Failure should leave position unchanged.
12957 fb69561e5901 maint: fix missing line continuation in src/Makefile.am John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	6102 rep->seek (orig_pos, SEEK_SET);
fb69561e5901 maint: fix missing line continuation in src/Makefile.am John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	6103
fb69561e5901 maint: fix missing line continuation in src/Makefile.am John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	6104 status = -1;
fb69561e5901 maint: fix missing line continuation in src/Makefile.am John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	6105 }
fb69561e5901 maint: fix missing line continuation in src/Makefile.am John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	6106 }
fb69561e5901 maint: fix missing line continuation in src/Makefile.am John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	6107 else
fb69561e5901 maint: fix missing line continuation in src/Makefile.am John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	6108 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6109 // Seeking to the desired position failed.
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6110 // Move back to original position and return failure status.
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6111 rep->seek (orig_pos, SEEK_SET);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6112
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6113 status = -1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6114 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6115 }
4889 658aad1c1b05 [project @ 2004-04-30 22:38:30 by jwe] jwe parents: 4888 diff changeset	6116 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6117
5065 1312d3af9eb0 [project @ 2004-11-04 20:12:00 by jwe] jwe parents: 5030 diff changeset	6118 return status;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6119 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6120
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6121 int
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6122 octave_stream::seek (const octave_value& tc_offset,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6123 const octave_value& tc_origin)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6124 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6125 int retval = -1;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6126
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6127 // FIXME: should we have octave_value methods that handle off_t explicitly?
20704 571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6128 octave_int64 val = tc_offset.xint64_scalar_value ("fseek: invalid value for offset");
16011 8122286c69a9 initial large file support for 32-bit systems John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	6129 off_t xoffset = val.value ();
4645 bd2067547b40 [project @ 2003-11-23 08:07:52 by jwe] jwe parents: 4643 diff changeset	6130
20704 571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6131 int conv_err = 0;
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6132
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6133 int origin = SEEK_SET;
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6134
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6135 if (tc_origin.is_string ())
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6136 {
20704 571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6137 std::string xorigin = tc_origin.string_value ("fseek: invalid value for origin");
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6138
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6139 if (xorigin == "bof")
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6140 origin = SEEK_SET;
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6141 else if (xorigin == "cof")
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6142 origin = SEEK_CUR;
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6143 else if (xorigin == "eof")
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6144 origin = SEEK_END;
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6145 else
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6146 conv_err = -1;
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6147 }
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6148 else
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6149 {
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6150 int xorigin = convert_to_valid_int (tc_origin, conv_err);
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6151
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6152 if (! conv_err)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6153 {
20704 571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6154 if (xorigin == -1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6155 origin = SEEK_SET;
20704 571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6156 else if (xorigin == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6157 origin = SEEK_CUR;
20704 571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6158 else if (xorigin == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6159 origin = SEEK_END;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6160 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6161 conv_err = -1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6162 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6163 }
20704 571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20650 diff changeset	6164
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	6165 if (conv_err)
20938 aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	6166 ::error ("fseek: invalid value for origin");
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6167
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	6168 retval = seek (xoffset, origin);
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	6169
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	6170 if (retval != 0)
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	6171 // Note: error is member fcn from octave_stream, not ::error.
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	6172 error ("fseek: failed to seek to requested position");
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6173
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6174 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6175 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6176
16011 8122286c69a9 initial large file support for 32-bit systems John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	6177 off_t
4797 19b8225bdaa2 [project @ 2004-02-23 22:10:31 by jwe] jwe parents: 4693 diff changeset	6178 octave_stream::tell (void)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6179 {
16011 8122286c69a9 initial large file support for 32-bit systems John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	6180 off_t retval = -1;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6181
5659 960f4b9a26af [project @ 2006-03-10 15:35:20 by jwe] jwe parents: 5649 diff changeset	6182 if (stream_ok ())
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6183 retval = rep->tell ();
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6184
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6185 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6186 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6187
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6188 int
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6189 octave_stream::rewind (void)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6190 {
6296 85eb75190e01 [project @ 2007-02-10 07:10:42 by jwe] jwe parents: 6109 diff changeset	6191 return seek (0, SEEK_SET);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6192 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6193
3340 585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	6194 bool
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	6195 octave_stream::is_open (void) const
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	6196 {
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	6197 bool retval = false;
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	6198
5659 960f4b9a26af [project @ 2006-03-10 15:35:20 by jwe] jwe parents: 5649 diff changeset	6199 if (stream_ok ())
3340 585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	6200 retval = rep->is_open ();
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	6201
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	6202 return retval;
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	6203 }
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	6204
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	6205 void
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	6206 octave_stream::close (void)
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	6207 {
5659 960f4b9a26af [project @ 2006-03-10 15:35:20 by jwe] jwe parents: 5649 diff changeset	6208 if (stream_ok ())
3340 585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	6209 rep->close ();
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	6210 }
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	6211
21335 e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6212 // FIXME: maybe these should be defined in lo-ieee.h?
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6213
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6214 template <typename T>
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6215 static inline bool
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6216 is_old_NA (T)
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6217 {
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6218 return false;
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6219 }
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6220
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6221 template <>
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6222 inline bool
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6223 is_old_NA<double> (double val)
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6224 {
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6225 return __lo_ieee_is_old_NA (val);
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6226 }
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6227
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6228 template <typename T>
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6229 static inline T
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6230 replace_old_NA (T val)
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6231 {
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6232 return val;
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6233 }
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6234
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6235 template <>
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6236 inline double
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6237 replace_old_NA<double> (double val)
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6238 {
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6239 return __lo_ieee_replace_old_NA (val);
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6240 }
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6241
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	6242 template <typename SRC_T, typename DST_T>
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6243 static octave_value
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6244 convert_and_copy (std::list<void *>& input_buf_list,
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6245 octave_idx_type input_buf_elts,
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6246 octave_idx_type elts_read,
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6247 octave_idx_type nr, octave_idx_type nc, bool swap,
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6248 bool do_float_fmt_conv, bool do_NA_conv,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6249 octave::mach_info::float_format from_flt_fmt)
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6250 {
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6251 typedef typename DST_T::element_type dst_elt_type;
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6252
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6253 DST_T conv (dim_vector (nr, nc));
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6254
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6255 dst_elt_type *conv_data = conv.fortran_vec ();
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6256
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6257 octave_idx_type j = 0;
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6258
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6259 for (std::list<void *>::const_iterator it = input_buf_list.begin ();
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6260 it != input_buf_list.end (); it++)
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6261 {
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6262 SRC_T data = static_cast<SRC_T > (*it);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6263
17463 cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6264 if (swap \|\| do_float_fmt_conv)
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6265 {
21335 e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6266 if (do_NA_conv)
17463 cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6267 {
21335 e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6268 for (octave_idx_type i = 0; i < input_buf_elts && j < elts_read;
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6269 i++, j++)
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6270 {
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6271 if (swap)
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6272 swap_bytes<sizeof (SRC_T)> (&data[i]);
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6273 else if (do_float_fmt_conv)
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6274 do_float_format_conversion (&data[i], sizeof (SRC_T),
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6275 1, from_flt_fmt,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6276 octave::mach_info::native_float_format ());
21335 e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6277
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6278 dst_elt_type tmp (data[i]);
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6279
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6280 if (is_old_NA (tmp))
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6281 tmp = replace_old_NA (tmp);
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6282
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6283 conv_data[j] = tmp;
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6284 }
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6285 }
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6286 else
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6287 {
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6288 for (octave_idx_type i = 0; i < input_buf_elts && j < elts_read;
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6289 i++, j++)
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6290 {
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6291 if (swap)
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6292 swap_bytes<sizeof (SRC_T)> (&data[i]);
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6293 else if (do_float_fmt_conv)
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6294 do_float_format_conversion (&data[i], sizeof (SRC_T),
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6295 1, from_flt_fmt,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6296 octave::mach_info::native_float_format ());
21335 e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6297
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6298 conv_data[j] = data[i];
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6299 }
17463 cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6300 }
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6301 }
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6302 else
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6303 {
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6304 if (do_NA_conv)
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6305 {
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6306 for (octave_idx_type i = 0; i < input_buf_elts && j < elts_read;
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6307 i++, j++)
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6308 {
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6309 dst_elt_type tmp (data[i]);
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6310
21335 e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6311 if (is_old_NA (tmp))
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6312 tmp = replace_old_NA (tmp);
17463 cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6313
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6314 conv_data[j] = tmp;
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6315 }
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6316 }
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6317 else
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6318 {
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6319 for (octave_idx_type i = 0; i < input_buf_elts && j < elts_read;
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6320 i++, j++)
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6321 conv_data[j] = data[i];
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6322 }
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6323 }
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6324
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6325 delete [] data;
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6326 }
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6327
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6328 input_buf_list.clear ();
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6329
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6330 for (octave_idx_type i = elts_read; i < nr * nc; i++)
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6331 conv_data[i] = dst_elt_type (0);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6332
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6333 return conv;
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6334 }
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6335
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6336 typedef octave_value (*conv_fptr)
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6337 (std::list<void *>& input_buf_list, octave_idx_type input_buf_elts,
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6338 octave_idx_type elts_read, octave_idx_type nr, octave_idx_type nc,
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6339 bool swap, bool do_float_fmt_conv, bool do_NA_conv,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6340 octave::mach_info::float_format from_flt_fmt);
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6341
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6342 #define TABLE_ELT(T, U, V, W) \
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6343 conv_fptr_table[oct_data_conv::T][oct_data_conv::U] = convert_and_copy<V, W>
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6344
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6345 #define FILL_TABLE_ROW(T, V) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6346 TABLE_ELT (T, dt_int8, V, int8NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6347 TABLE_ELT (T, dt_uint8, V, uint8NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6348 TABLE_ELT (T, dt_int16, V, int16NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6349 TABLE_ELT (T, dt_uint16, V, uint16NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6350 TABLE_ELT (T, dt_int32, V, int32NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6351 TABLE_ELT (T, dt_uint32, V, uint32NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6352 TABLE_ELT (T, dt_int64, V, int64NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6353 TABLE_ELT (T, dt_uint64, V, uint64NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6354 TABLE_ELT (T, dt_single, V, FloatNDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6355 TABLE_ELT (T, dt_double, V, NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6356 TABLE_ELT (T, dt_char, V, charNDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6357 TABLE_ELT (T, dt_schar, V, charNDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6358 TABLE_ELT (T, dt_uchar, V, charNDArray); \
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6359 TABLE_ELT (T, dt_logical, V, boolNDArray);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6360
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6361 octave_value
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6362 octave_stream::finalize_read (std::list<void *>& input_buf_list,
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6363 octave_idx_type input_buf_elts,
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6364 octave_idx_type elts_read,
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6365 octave_idx_type nr, octave_idx_type nc,
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6366 oct_data_conv::data_type input_type,
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6367 oct_data_conv::data_type output_type,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6368 octave::mach_info::float_format ffmt)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6369 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6370 octave_value retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6371
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6372 static bool initialized = false;
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6373
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6374 // Table function pointers for return types x read types.
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6375
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6376 static conv_fptr conv_fptr_table[oct_data_conv::dt_unknown][14];
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6377
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6378 if (! initialized)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6379 {
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6380 for (int i = 0; i < oct_data_conv::dt_unknown; i++)
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6381 for (int j = 0; j < 14; j++)
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6382 conv_fptr_table[i][j] = 0;
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6383
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6384 FILL_TABLE_ROW (dt_int8, int8_t);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6385 FILL_TABLE_ROW (dt_uint8, uint8_t);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6386 FILL_TABLE_ROW (dt_int16, int16_t);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6387 FILL_TABLE_ROW (dt_uint16, uint16_t);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6388 FILL_TABLE_ROW (dt_int32, int32_t);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6389 FILL_TABLE_ROW (dt_uint32, uint32_t);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6390 FILL_TABLE_ROW (dt_int64, int64_t);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6391 FILL_TABLE_ROW (dt_uint64, uint64_t);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6392 FILL_TABLE_ROW (dt_single, float);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6393 FILL_TABLE_ROW (dt_double, double);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6394 FILL_TABLE_ROW (dt_char, char);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6395 FILL_TABLE_ROW (dt_schar, signed char);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6396 FILL_TABLE_ROW (dt_uchar, unsigned char);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6397 FILL_TABLE_ROW (dt_logical, bool);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6398
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6399 initialized = true;
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6400 }
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6401
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6402 bool swap = false;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6403
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6404 if (ffmt == octave::mach_info::flt_fmt_unknown)
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6405 ffmt = float_format ();
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6406
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6407 if (octave::mach_info::words_big_endian ())
c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6408 swap = (ffmt == octave::mach_info::flt_fmt_ieee_little_endian);
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6409 else
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6410 swap = (ffmt == octave::mach_info::flt_fmt_ieee_big_endian);
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6411
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6412 bool do_float_fmt_conv = ((input_type == oct_data_conv::dt_double
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6413 \|\| input_type == oct_data_conv::dt_single)
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6414 && ffmt != float_format ());
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6415
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6416 bool do_NA_conv = (output_type == oct_data_conv::dt_double);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6417
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6418 switch (output_type)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6419 {
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6420 case oct_data_conv::dt_int8:
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6421 case oct_data_conv::dt_uint8:
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6422 case oct_data_conv::dt_int16:
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6423 case oct_data_conv::dt_uint16:
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6424 case oct_data_conv::dt_int32:
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6425 case oct_data_conv::dt_uint32:
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6426 case oct_data_conv::dt_int64:
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6427 case oct_data_conv::dt_uint64:
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6428 case oct_data_conv::dt_single:
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6429 case oct_data_conv::dt_double:
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6430 case oct_data_conv::dt_char:
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6431 case oct_data_conv::dt_schar:
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6432 case oct_data_conv::dt_uchar:
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6433 case oct_data_conv::dt_logical:
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6434 {
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6435 conv_fptr fptr = conv_fptr_table[input_type][output_type];
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6436
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6437 retval = fptr (input_buf_list, input_buf_elts, elts_read,
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6438 nr, nc, swap, do_float_fmt_conv, do_NA_conv, ffmt);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6439 }
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6440 break;
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6441
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6442 default:
20938 aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	6443 ::error ("read: invalid type specification");
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6444 }
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6445
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6446 return retval;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6447 }
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6448
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6449 octave_value
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5266 diff changeset	6450 octave_stream::read (const Array<double>& size, octave_idx_type block_size,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6451 oct_data_conv::data_type input_type,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6452 oct_data_conv::data_type output_type,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6453 octave_idx_type skip, octave::mach_info::float_format ffmt,
18210 a0abcf377ec5 return elements read, not bytes in fread second output (bug #41091) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	6454 octave_idx_type& count)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6455 {
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6456 octave_value retval;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6457
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6458 octave_idx_type nr = -1;
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6459 octave_idx_type nc = -1;
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6460
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6461 bool one_elt_size_spec = false;
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6462
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6463 if (! stream_ok ())
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6464 return retval;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6465
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6466 // FIXME: we may eventually want to make this extensible.
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6467
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6468 // FIXME: we need a better way to ensure that this
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6469 // numbering stays consistent with the order of the elements in the
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6470 // data_type enum in the oct_data_conv class.
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6471
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6472 // Expose this in a future version?
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6473 octave_idx_type char_count = 0;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6474
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6475 count = 0;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6476
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6477 try
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6478 {
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6479 get_size (size, nr, nc, one_elt_size_spec, "fread");
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6480 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	6481 catch (const octave::execution_exception&)
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6482 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6483 invalid_operation ("fread", "reading");
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6484 }
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6485
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6486 octave_idx_type elts_to_read;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6487
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6488 if (one_elt_size_spec)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6489 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6490 // If NR == 0, Matlab returns [](0x0).
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6491
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6492 // If NR > 0, the result will be a column vector with the given
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6493 // number of rows.
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6494
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6495 // If NR < 0, then we have Inf and the result will be a column
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6496 // vector but we have to wait to see how big NR will be.
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6497
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6498 if (nr == 0)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6499 nr = nc = 0;
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	6500 else
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6501 nc = 1;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6502 }
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6503 else
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6504 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6505 // Matlab returns [] even if there are two elements in the size
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6506 // specification and one is nonzero.
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6507
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6508 // If NC < 0 we have [NR, Inf] and we'll wait to decide how big NC
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6509 // should be.
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6510
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6511 if (nr == 0 \|\| nc == 0)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6512 nr = nc = 0;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6513 }
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6514
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6515 // FIXME: Ensure that this does not overflow.
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6516 // Maybe try comparing nr * nc computed in double with
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6517 // std::numeric_limits<octave_idx_type>::max ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6518 elts_to_read = nr * nc;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6519
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6520 bool read_to_eof = elts_to_read < 0;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6521
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6522 octave_idx_type input_buf_elts = -1;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6523
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6524 if (skip == 0)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6525 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6526 if (read_to_eof)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6527 input_buf_elts = 1024 * 1024;
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6528 else
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6529 input_buf_elts = elts_to_read;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6530 }
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6531 else
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6532 input_buf_elts = block_size;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6533
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6534 octave_idx_type input_elt_size
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6535 = oct_data_conv::data_type_size (input_type);
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6536
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6537 octave_idx_type input_buf_size = input_buf_elts * input_elt_size;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6538
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6539 assert (input_buf_size >= 0);
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6540
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6541 // Must also work and return correct type object
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6542 // for 0 elements to read.
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6543 std::istream *isp = input_stream ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6544
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6545 if (! isp)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6546 error ("fread: invalid input stream");
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6547 else
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6548 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6549 std::istream& is = *isp;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6550
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6551 std::list <void *> input_buf_list;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6552
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6553 while (is && ! is.eof ()
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6554 && (read_to_eof \|\| count < elts_to_read))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6555 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6556 if (! read_to_eof)
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6557 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6558 octave_idx_type remaining_elts = elts_to_read - count;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6559
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6560 if (remaining_elts < input_buf_elts)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6561 input_buf_size = remaining_elts * input_elt_size;
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6562 }
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6563
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6564 char *input_buf = new char [input_buf_size];
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6565
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6566 is.read (input_buf, input_buf_size);
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6567
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6568 size_t gcount = is.gcount ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6569
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6570 char_count += gcount;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6571
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6572 octave_idx_type nel = gcount / input_elt_size;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6573
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6574 count += nel;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6575
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6576 input_buf_list.push_back (input_buf);
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6577
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6578 if (is && skip != 0 && nel == block_size)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6579 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6580 // Seek to skip.
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6581 // If skip would move past EOF, position at EOF.
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6582
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6583 off_t orig_pos = tell ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6584
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6585 seek (0, SEEK_END);
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6586
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6587 off_t eof_pos = tell ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6588
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6589 // Is it possible for this to fail to return us to
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6590 // the original position?
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6591 seek (orig_pos, SEEK_SET);
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6592
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6593 off_t remaining = eof_pos - orig_pos;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6594
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6595 if (remaining < skip)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6596 seek (0, SEEK_END);
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6597 else
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6598 seek (skip, SEEK_CUR);
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6599
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6600 if (! is)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6601 break;
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6602 }
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6603 }
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6604
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6605 if (read_to_eof)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6606 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6607 if (nc < 0)
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6608 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6609 nc = count / nr;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6610
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	6611 if (count % nr != 0)
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6612 nc++;
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6613 }
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6614 else
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6615 nr = count;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6616 }
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6617 else if (count == 0)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6618 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6619 nr = 0;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6620 nc = 0;
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	6621 }
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6622 else if (count != nr * nc)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6623 {
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6624 if (count % nr != 0)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6625 nc = count / nr + 1;
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6626 else
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6627 nc = count / nr;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6628
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6629 if (count < nr)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6630 nr = count;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6631 }
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6632
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6633 retval = finalize_read (input_buf_list, input_buf_elts, count,
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6634 nr, nc, input_type, output_type, ffmt);
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6635 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6636
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6637 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6638 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6639
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5266 diff changeset	6640 octave_idx_type
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5266 diff changeset	6641 octave_stream::write (const octave_value& data, octave_idx_type block_size,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6642 oct_data_conv::data_type output_type,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6643 octave_idx_type skip, octave::mach_info::float_format flt_fmt)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6644 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5266 diff changeset	6645 octave_idx_type retval = -1;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6646
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6647 if (! stream_ok ())
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6648 invalid_operation ("fwrite", "writing");
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6649 else
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6650 {
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6651 if (flt_fmt == octave::mach_info::flt_fmt_unknown)
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	6652 flt_fmt = float_format ();
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	6653
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	6654 octave_idx_type status = data.write (*this, block_size, output_type,
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	6655 skip, flt_fmt);
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	6656
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	6657 if (status < 0)
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	6658 error ("fwrite: write error");
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6659 else
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	6660 retval = status;
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6661 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6662
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6663 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6664 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6665
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	6666 template <typename T, typename V>
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6667 static void
18616 aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6668 convert_chars (const void data, void conv_data, octave_idx_type n_elts)
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6669 {
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6670 const T tt_data = static_cast<const T > (data);
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6671
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6672 V vt_data = static_cast<V > (conv_data);
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6673
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6674 for (octave_idx_type i = 0; i < n_elts; i++)
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6675 vt_data[i] = tt_data[i];
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6676 }
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6677
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	6678 template <typename T, typename V>
18616 aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6679 static void
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6680 convert_ints (const T data, void conv_data, octave_idx_type n_elts,
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6681 bool swap)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6682 {
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6683 typedef typename V::val_type val_type;
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6684
19739 3fa35defe495 Adjust spacing of static_cast<> calls to follow Octave coding conventions. Rik <rik@octave.org> parents: 19729 diff changeset	6685 val_type vt_data = static_cast<val_type > (conv_data);
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6686
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6687 for (octave_idx_type i = 0; i < n_elts; i++)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6688 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6689 // Yes, we want saturation semantics when converting to an integer type.
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6690 V val (data[i]);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6691
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6692 vt_data[i] = val.value ();
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6693
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6694 if (swap)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6695 swap_bytes<sizeof (val_type)> (&vt_data[i]);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6696 }
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6697 }
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6698
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	6699 template <typename T>
18616 aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6700 class ultimate_element_type
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6701 {
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6702 public:
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6703 typedef T type;
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6704 };
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6705
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	6706 template <typename T>
18616 aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6707 class ultimate_element_type<octave_int<T> >
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6708 {
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6709 public:
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6710 typedef T type;
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6711 };
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6712
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	6713 template <typename T>
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6714 static bool
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6715 convert_data (const T data, void conv_data, octave_idx_type n_elts,
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6716 oct_data_conv::data_type output_type,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6717 octave::mach_info::float_format flt_fmt)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6718 {
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6719 bool retval = true;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6720
21776 1e81dd035639 Write integers with correct byte order on big-endian systems (bug #47434) Mike Miller <mtmiller@octave.org> parents: 21296 diff changeset	6721 bool swap = false;
1e81dd035639 Write integers with correct byte order on big-endian systems (bug #47434) Mike Miller <mtmiller@octave.org> parents: 21296 diff changeset	6722
21777 d6826b38b29c maint: Periodic merge of stable to default. Mike Miller <mtmiller@octave.org> parents: 21751 21776 diff changeset	6723 if (octave::mach_info::words_big_endian ())
d6826b38b29c maint: Periodic merge of stable to default. Mike Miller <mtmiller@octave.org> parents: 21751 21776 diff changeset	6724 swap = (flt_fmt == octave::mach_info::flt_fmt_ieee_little_endian);
21776 1e81dd035639 Write integers with correct byte order on big-endian systems (bug #47434) Mike Miller <mtmiller@octave.org> parents: 21296 diff changeset	6725 else
21777 d6826b38b29c maint: Periodic merge of stable to default. Mike Miller <mtmiller@octave.org> parents: 21751 21776 diff changeset	6726 swap = (flt_fmt == octave::mach_info::flt_fmt_ieee_big_endian);
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6727
c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6728 bool do_float_conversion = flt_fmt != octave::mach_info::float_format ();
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6729
18616 aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6730 typedef typename ultimate_element_type<T>::type ult_elt_type;
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6731
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6732 switch (output_type)
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6733 {
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6734 case oct_data_conv::dt_char:
18616 aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6735 convert_chars<ult_elt_type, char> (data, conv_data, n_elts);
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6736 break;
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6737
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6738 case oct_data_conv::dt_schar:
18616 aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6739 convert_chars<ult_elt_type, signed char> (data, conv_data, n_elts);
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6740 break;
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6741
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6742 case oct_data_conv::dt_uchar:
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6743 convert_chars<ult_elt_type, unsigned char> (data, conv_data, n_elts);
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6744 break;
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6745
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6746 case oct_data_conv::dt_int8:
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6747 convert_ints<T, octave_int8> (data, conv_data, n_elts, swap);
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6748 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6749
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6750 case oct_data_conv::dt_uint8:
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6751 convert_ints<T, octave_uint8> (data, conv_data, n_elts, swap);
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6752 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6753
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6754 case oct_data_conv::dt_int16:
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6755 convert_ints<T, octave_int16> (data, conv_data, n_elts, swap);
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6756 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6757
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6758 case oct_data_conv::dt_uint16:
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6759 convert_ints<T, octave_uint16> (data, conv_data, n_elts, swap);
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6760 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6761
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6762 case oct_data_conv::dt_int32:
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6763 convert_ints<T, octave_int32> (data, conv_data, n_elts, swap);
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6764 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6765
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6766 case oct_data_conv::dt_uint32:
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6767 convert_ints<T, octave_uint32> (data, conv_data, n_elts, swap);
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6768 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6769
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6770 case oct_data_conv::dt_int64:
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6771 convert_ints<T, octave_int64> (data, conv_data, n_elts, swap);
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6772 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6773
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6774 case oct_data_conv::dt_uint64:
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6775 convert_ints<T, octave_uint64> (data, conv_data, n_elts, swap);
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6776 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6777
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6778 case oct_data_conv::dt_single:
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6779 {
19739 3fa35defe495 Adjust spacing of static_cast<> calls to follow Octave coding conventions. Rik <rik@octave.org> parents: 19729 diff changeset	6780 float vt_data = static_cast<float > (conv_data);
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6781
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6782 for (octave_idx_type i = 0; i < n_elts; i++)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6783 {
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6784 vt_data[i] = data[i];
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6785
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6786 if (do_float_conversion)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6787 do_float_format_conversion (&vt_data[i], 1, flt_fmt);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6788 }
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6789 }
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6790 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6791
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6792 case oct_data_conv::dt_double:
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6793 {
19739 3fa35defe495 Adjust spacing of static_cast<> calls to follow Octave coding conventions. Rik <rik@octave.org> parents: 19729 diff changeset	6794 double vt_data = static_cast<double > (conv_data);
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6795
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6796 for (octave_idx_type i = 0; i < n_elts; i++)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6797 {
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6798 vt_data[i] = data[i];
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6799
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6800 if (do_float_conversion)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6801 do_double_format_conversion (&vt_data[i], 1, flt_fmt);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6802 }
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6803 }
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6804 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6805
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6806 default:
20938 aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	6807 ::error ("write: invalid type specification");
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6808 }
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6809
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6810 return retval;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6811 }
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6812
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6813 bool
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6814 octave_stream::write_bytes (const void *data, size_t nbytes)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6815 {
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6816 bool status = false;
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6817
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6818 std::ostream *osp = output_stream ();
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6819
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6820 if (osp)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6821 {
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6822 std::ostream& os = *osp;
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6823
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6824 if (os)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6825 {
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6826 os.write (static_cast<const char *> (data), nbytes);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6827
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6828 if (os)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6829 status = true;
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6830 }
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6831 }
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6832
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6833 return status;
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6834 }
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6835
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6836 bool
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6837 octave_stream::skip_bytes (size_t skip)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6838 {
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6839 bool status = false;
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6840
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6841 std::ostream *osp = output_stream ();
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6842
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6843 if (! osp)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6844 return false;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6845
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6846 std::ostream& os = *osp;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6847
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6848 // Seek to skip when inside bounds of existing file.
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6849 // Otherwise, write NUL to skip.
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6850 off_t orig_pos = tell ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6851
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6852 seek (0, SEEK_END);
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6853
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6854 off_t eof_pos = tell ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6855
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6856 // Is it possible for this to fail to return us to the original position?
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6857 seek (orig_pos, SEEK_SET);
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6858
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6859 size_t remaining = eof_pos - orig_pos;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6860
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6861 if (remaining < skip)
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6862 {
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6863 seek (0, SEEK_END);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6864
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6865 // FIXME: probably should try to write larger blocks...
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6866 unsigned char zero = 0;
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6867 for (size_t j = 0; j < skip - remaining; j++)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6868 os.write (reinterpret_cast<const char *> (&zero), 1);
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6869 }
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6870 else
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6871 seek (skip, SEEK_CUR);
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6872
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6873 if (os)
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6874 status = true;
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6875
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6876 return status;
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6877 }
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6878
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	6879 template <typename T>
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5266 diff changeset	6880 octave_idx_type
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5266 diff changeset	6881 octave_stream::write (const Array<T>& data, octave_idx_type block_size,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6882 oct_data_conv::data_type output_type,
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6883 octave_idx_type skip,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6884 octave::mach_info::float_format flt_fmt)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6885 {
21776 1e81dd035639 Write integers with correct byte order on big-endian systems (bug #47434) Mike Miller <mtmiller@octave.org> parents: 21296 diff changeset	6886 bool swap = false;
1e81dd035639 Write integers with correct byte order on big-endian systems (bug #47434) Mike Miller <mtmiller@octave.org> parents: 21296 diff changeset	6887
21777 d6826b38b29c maint: Periodic merge of stable to default. Mike Miller <mtmiller@octave.org> parents: 21751 21776 diff changeset	6888 if (octave::mach_info::words_big_endian ())
d6826b38b29c maint: Periodic merge of stable to default. Mike Miller <mtmiller@octave.org> parents: 21751 21776 diff changeset	6889 swap = (flt_fmt == octave::mach_info::flt_fmt_ieee_little_endian);
21776 1e81dd035639 Write integers with correct byte order on big-endian systems (bug #47434) Mike Miller <mtmiller@octave.org> parents: 21296 diff changeset	6890 else
21777 d6826b38b29c maint: Periodic merge of stable to default. Mike Miller <mtmiller@octave.org> parents: 21751 21776 diff changeset	6891 swap = (flt_fmt == octave::mach_info::flt_fmt_ieee_big_endian);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6892
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6893 bool do_data_conversion = (swap \|\| ! is_equivalent_type<T> (output_type)
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6894 \|\| flt_fmt != octave::mach_info::float_format ());
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6895
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6896 octave_idx_type nel = data.numel ();
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6897
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6898 octave_idx_type chunk_size;
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6899
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6900 if (skip != 0)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6901 chunk_size = block_size;
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6902 else if (do_data_conversion)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6903 chunk_size = 1024 * 1024;
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6904 else
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6905 chunk_size = nel;
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6906
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6907 octave_idx_type i = 0;
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6908
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6909 const T *pdata = data.data ();
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6910
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6911 while (i < nel)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6912 {
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6913 if (skip != 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6914 {
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6915 if (! skip_bytes (skip))
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6916 return -1;
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6917 }
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6918
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6919 octave_idx_type remaining_nel = nel - i;
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6920
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6921 if (chunk_size > remaining_nel)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6922 chunk_size = remaining_nel;
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6923
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6924 bool status = false;
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6925
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6926 if (do_data_conversion)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6927 {
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6928 size_t output_size
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6929 = chunk_size * oct_data_conv::data_type_size (output_type);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6930
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6931 OCTAVE_LOCAL_BUFFER (unsigned char, conv_data, output_size);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6932
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6933 status = convert_data (&pdata[i], conv_data, chunk_size,
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6934 output_type, flt_fmt);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6935
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6936 if (status)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6937 status = write_bytes (conv_data, output_size);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6938 }
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6939 else
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6940 status = write_bytes (pdata, sizeof (T) * chunk_size);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6941
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6942 if (! status)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6943 return -1;
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6944
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6945 i += chunk_size;
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6946 }
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6947
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6948 return nel;
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6949 }
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6950
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6951 #define INSTANTIATE_WRITE(T) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6952 template \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6953 octave_idx_type \
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6954 octave_stream::write (const Array<T>& data, octave_idx_type block_size, \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6955 oct_data_conv::data_type output_type, \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6956 octave_idx_type skip, \
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6957 octave::mach_info::float_format flt_fmt)
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6958
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6959 INSTANTIATE_WRITE (octave_int8);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6960 INSTANTIATE_WRITE (octave_uint8);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6961 INSTANTIATE_WRITE (octave_int16);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6962 INSTANTIATE_WRITE (octave_uint16);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6963 INSTANTIATE_WRITE (octave_int32);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6964 INSTANTIATE_WRITE (octave_uint32);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6965 INSTANTIATE_WRITE (octave_int64);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6966 INSTANTIATE_WRITE (octave_uint64);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6967 INSTANTIATE_WRITE (int8_t);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6968 INSTANTIATE_WRITE (uint8_t);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6969 INSTANTIATE_WRITE (int16_t);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6970 INSTANTIATE_WRITE (uint16_t);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6971 INSTANTIATE_WRITE (int32_t);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6972 INSTANTIATE_WRITE (uint32_t);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6973 INSTANTIATE_WRITE (int64_t);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6974 INSTANTIATE_WRITE (uint64_t);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6975 INSTANTIATE_WRITE (bool);
21354 06d15e4e611a move public data type macros to octave-config.h John W. Eaton <jwe@octave.org> parents: 21335 diff changeset	6976 #if defined (OCTAVE_HAVE_OVERLOAD_CHAR_INT8_TYPES)
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6977 INSTANTIATE_WRITE (char);
21235 b48d65c5df5b Disable char/int8_t function overloads where not permitted (bug #45411) Mike Miller <mtmiller@octave.org> parents: 20252 diff changeset	6978 #endif
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6979 INSTANTIATE_WRITE (float);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6980 INSTANTIATE_WRITE (double);
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6981
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6982 octave_value
3810 f19f00339363 [project @ 2001-03-29 21:03:01 by jwe] jwe parents: 3779 diff changeset	6983 octave_stream::scanf (const std::string& fmt, const Array<double>& size,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6984 octave_idx_type& count, const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6985 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6986 octave_value retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6987
5659 960f4b9a26af [project @ 2006-03-10 15:35:20 by jwe] jwe parents: 5649 diff changeset	6988 if (stream_ok ())
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	6989 retval = rep->scanf (fmt, size, count, who);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6990
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6991 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6992 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6993
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	6994 octave_value
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	6995 octave_stream::scanf (const octave_value& fmt, const Array<double>& size,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	6996 octave_idx_type& count, const std::string& who)
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	6997 {
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	6998 octave_value retval = Matrix ();
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	6999
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7000 if (fmt.is_string ())
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7001 {
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7002 std::string sfmt = fmt.string_value ();
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7003
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7004 if (fmt.is_sq_string ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7005 sfmt = do_string_escapes (sfmt);
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7006
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7007 retval = scanf (sfmt, size, count, who);
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7008 }
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7009 else
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7010 {
20938 aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	7011 // Note: error is member fcn from octave_stream, not ::error.
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7012 error (who + ": format must be a string");
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7013 }
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7014
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7015 return retval;
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7016 }
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7017
2215 ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	7018 octave_value_list
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	7019 octave_stream::oscanf (const std::string& fmt, const std::string& who)
2215 ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	7020 {
ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	7021 octave_value_list retval;
ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	7022
5659 960f4b9a26af [project @ 2006-03-10 15:35:20 by jwe] jwe parents: 5649 diff changeset	7023 if (stream_ok ())
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	7024 retval = rep->oscanf (fmt, who);
2215 ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	7025
ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	7026 return retval;
ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	7027 }
ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	7028
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7029 octave_value_list
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7030 octave_stream::oscanf (const octave_value& fmt, const std::string& who)
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7031 {
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7032 octave_value_list retval;
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7033
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7034 if (fmt.is_string ())
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7035 {
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7036 std::string sfmt = fmt.string_value ();
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7037
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7038 if (fmt.is_sq_string ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7039 sfmt = do_string_escapes (sfmt);
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7040
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7041 retval = oscanf (sfmt, who);
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7042 }
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7043 else
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7044 {
20938 aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	7045 // Note: error is member fcn from octave_stream, not ::error.
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7046 error (who + ": format must be a string");
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7047 }
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7048
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7049 return retval;
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7050 }
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7051
21503 20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	7052 octave_value
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	7053 octave_stream::textscan (const std::string& fmt, octave_idx_type ntimes,
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	7054 const octave_value_list& options,
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	7055 const std::string& who, octave_idx_type& count)
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	7056 {
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	7057 return (stream_ok ()
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	7058 ? rep->do_textscan (fmt, ntimes, options, who, count)
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	7059 : octave_value ());
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	7060 }
20bf0ec536e2 integrate textscan more completely with octave_stream class John W. Eaton <jwe@octave.org> parents: 21502 diff changeset	7061
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7062 int
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	7063 octave_stream::printf (const std::string& fmt, const octave_value_list& args,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7064 const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7065 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7066 int retval = -1;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7067
5659 960f4b9a26af [project @ 2006-03-10 15:35:20 by jwe] jwe parents: 5649 diff changeset	7068 if (stream_ok ())
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	7069 retval = rep->printf (fmt, args, who);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7070
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7071 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7072 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7073
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7074 int
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7075 octave_stream::printf (const octave_value& fmt, const octave_value_list& args,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7076 const std::string& who)
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7077 {
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7078 int retval = 0;
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7079
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7080 if (fmt.is_string ())
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7081 {
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7082 std::string sfmt = fmt.string_value ();
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7083
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7084 if (fmt.is_sq_string ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7085 sfmt = do_string_escapes (sfmt);
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7086
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7087 retval = printf (sfmt, args, who);
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7088 }
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7089 else
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7090 {
20938 aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	7091 // Note: error is member fcn from octave_stream, not ::error.
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7092 error (who + ": format must be a string");
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7093 }
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7094
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7095 return retval;
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7096 }
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7097
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7098 int
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	7099 octave_stream::puts (const std::string& s, const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7100 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7101 int retval = -1;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7102
5659 960f4b9a26af [project @ 2006-03-10 15:35:20 by jwe] jwe parents: 5649 diff changeset	7103 if (stream_ok ())
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	7104 retval = rep->puts (s, who);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7105
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7106 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7107 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7108
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7109 // FIXME: maybe this should work for string arrays too.
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7110
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7111 int
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	7112 octave_stream::puts (const octave_value& tc_s, const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7113 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7114 int retval = -1;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7115
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7116 if (tc_s.is_string ())
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7117 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11574 diff changeset	7118 std::string s = tc_s.string_value ();
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	7119 retval = puts (s, who);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7120 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7121 else
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	7122 {
20938 aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	7123 // Note: error is member fcn from octave_stream, not ::error.
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	7124 error (who + ": argument must be a string");
efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	7125 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7126
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7127 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7128 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7129
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7130 bool
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7131 octave_stream::eof (void) const
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7132 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7133 int retval = -1;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7134
5659 960f4b9a26af [project @ 2006-03-10 15:35:20 by jwe] jwe parents: 5649 diff changeset	7135 if (stream_ok ())
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7136 retval = rep->eof ();
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7137
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7138 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7139 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7140
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3535 diff changeset	7141 std::string
2435 3be97fe02051 [project @ 1996-10-27 21:31:29 by jwe] jwe parents: 2341 diff changeset	7142 octave_stream::error (bool clear, int& err_num)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7143 {
5649 d24b97246b9b [project @ 2006-03-08 20:31:25 by jwe] jwe parents: 5581 diff changeset	7144 std::string retval = "invalid stream object";
d24b97246b9b [project @ 2006-03-08 20:31:25 by jwe] jwe parents: 5581 diff changeset	7145
5659 960f4b9a26af [project @ 2006-03-10 15:35:20 by jwe] jwe parents: 5649 diff changeset	7146 if (stream_ok (false))
2435 3be97fe02051 [project @ 1996-10-27 21:31:29 by jwe] jwe parents: 2341 diff changeset	7147 retval = rep->error (clear, err_num);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7148
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7149 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7150 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7151
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3535 diff changeset	7152 std::string
3340 585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	7153 octave_stream::name (void) const
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7154 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	7155 std::string retval;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7156
5659 960f4b9a26af [project @ 2006-03-10 15:35:20 by jwe] jwe parents: 5649 diff changeset	7157 if (stream_ok ())
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7158 retval = rep->name ();
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7159
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7160 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7161 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7162
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7163 int
3340 585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	7164 octave_stream::mode (void) const
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7165 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7166 int retval = 0;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7167
5659 960f4b9a26af [project @ 2006-03-10 15:35:20 by jwe] jwe parents: 5649 diff changeset	7168 if (stream_ok ())
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7169 retval = rep->mode ();
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7170
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7171 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7172 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7173
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	7174 octave::mach_info::float_format
3340 585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	7175 octave_stream::float_format (void) const
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7176 {
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	7177 octave::mach_info::float_format retval = octave::mach_info::flt_fmt_unknown;
2317 8c09c04f7747 [project @ 1996-07-14 22:30:15 by jwe] jwe parents: 2305 diff changeset	7178
5659 960f4b9a26af [project @ 2006-03-10 15:35:20 by jwe] jwe parents: 5649 diff changeset	7179 if (stream_ok ())
2317 8c09c04f7747 [project @ 1996-07-14 22:30:15 by jwe] jwe parents: 2305 diff changeset	7180 retval = rep->float_format ();
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7181
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7182 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7183 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7184
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3535 diff changeset	7185 std::string
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7186 octave_stream::mode_as_string (int mode)
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7187 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	7188 std::string retval = "???";
3775 13905c3a24af [project @ 2001-02-06 01:56:59 by jwe] jwe parents: 3716 diff changeset	7189 std::ios::openmode in_mode = static_cast<std::ios::openmode> (mode);
13905c3a24af [project @ 2001-02-06 01:56:59 by jwe] jwe parents: 3716 diff changeset	7190
13905c3a24af [project @ 2001-02-06 01:56:59 by jwe] jwe parents: 3716 diff changeset	7191 if (in_mode == std::ios::in)
13905c3a24af [project @ 2001-02-06 01:56:59 by jwe] jwe parents: 3716 diff changeset	7192 retval = "r";
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11574 diff changeset	7193 else if (in_mode == std::ios::out
4078 bd51df637cb3 [project @ 2002-09-27 23:23:20 by jwe] jwe parents: 4070 diff changeset	7194 \|\| in_mode == (std::ios::out \| std::ios::trunc))
3775 13905c3a24af [project @ 2001-02-06 01:56:59 by jwe] jwe parents: 3716 diff changeset	7195 retval = "w";
4078 bd51df637cb3 [project @ 2002-09-27 23:23:20 by jwe] jwe parents: 4070 diff changeset	7196 else if (in_mode == (std::ios::out \| std::ios::app))
3775 13905c3a24af [project @ 2001-02-06 01:56:59 by jwe] jwe parents: 3716 diff changeset	7197 retval = "a";
4078 bd51df637cb3 [project @ 2002-09-27 23:23:20 by jwe] jwe parents: 4070 diff changeset	7198 else if (in_mode == (std::ios::in \| std::ios::out))
3775 13905c3a24af [project @ 2001-02-06 01:56:59 by jwe] jwe parents: 3716 diff changeset	7199 retval = "r+";
4078 bd51df637cb3 [project @ 2002-09-27 23:23:20 by jwe] jwe parents: 4070 diff changeset	7200 else if (in_mode == (std::ios::in \| std::ios::out \| std::ios::trunc))
3775 13905c3a24af [project @ 2001-02-06 01:56:59 by jwe] jwe parents: 3716 diff changeset	7201 retval = "w+";
4078 bd51df637cb3 [project @ 2002-09-27 23:23:20 by jwe] jwe parents: 4070 diff changeset	7202 else if (in_mode == (std::ios::in \| std::ios::out \| std::ios::ate))
3775 13905c3a24af [project @ 2001-02-06 01:56:59 by jwe] jwe parents: 3716 diff changeset	7203 retval = "a+";
4078 bd51df637cb3 [project @ 2002-09-27 23:23:20 by jwe] jwe parents: 4070 diff changeset	7204 else if (in_mode == (std::ios::in \| std::ios::binary))
3775 13905c3a24af [project @ 2001-02-06 01:56:59 by jwe] jwe parents: 3716 diff changeset	7205 retval = "rb";
4078 bd51df637cb3 [project @ 2002-09-27 23:23:20 by jwe] jwe parents: 4070 diff changeset	7206 else if (in_mode == (std::ios::out \| std::ios::binary)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7207 \|\| in_mode == (std::ios::out \| std::ios::trunc \| std::ios::binary))
3775 13905c3a24af [project @ 2001-02-06 01:56:59 by jwe] jwe parents: 3716 diff changeset	7208 retval = "wb";
4078 bd51df637cb3 [project @ 2002-09-27 23:23:20 by jwe] jwe parents: 4070 diff changeset	7209 else if (in_mode == (std::ios::out \| std::ios::app \| std::ios::binary))
3775 13905c3a24af [project @ 2001-02-06 01:56:59 by jwe] jwe parents: 3716 diff changeset	7210 retval = "ab";
4078 bd51df637cb3 [project @ 2002-09-27 23:23:20 by jwe] jwe parents: 4070 diff changeset	7211 else if (in_mode == (std::ios::in \| std::ios::out \| std::ios::binary))
3775 13905c3a24af [project @ 2001-02-06 01:56:59 by jwe] jwe parents: 3716 diff changeset	7212 retval = "r+b";
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11574 diff changeset	7213 else if (in_mode == (std::ios::in \| std::ios::out \| std::ios::trunc
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7214 \| std::ios::binary))
3775 13905c3a24af [project @ 2001-02-06 01:56:59 by jwe] jwe parents: 3716 diff changeset	7215 retval = "w+b";
4078 bd51df637cb3 [project @ 2002-09-27 23:23:20 by jwe] jwe parents: 4070 diff changeset	7216 else if (in_mode == (std::ios::in \| std::ios::out \| std::ios::ate
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7217 \| std::ios::binary))
3775 13905c3a24af [project @ 2001-02-06 01:56:59 by jwe] jwe parents: 3716 diff changeset	7218 retval = "a+b";
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7219
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7220 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7221 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7222
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7223 octave_stream_list *octave_stream_list::instance = 0;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7224
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7225 bool
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7226 octave_stream_list::instance_ok (void)
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7227 {
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7228 bool retval = true;
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7229
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7230 if (! instance)
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13271 diff changeset	7231 {
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13271 diff changeset	7232 instance = new octave_stream_list ();
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13271 diff changeset	7233
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13271 diff changeset	7234 if (instance)
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13271 diff changeset	7235 singleton_cleanup_list::add (cleanup_instance);
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13271 diff changeset	7236 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7237
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7238 if (! instance)
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20768 diff changeset	7239 ::error ("unable to create stream list object!");
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7240
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7241 return retval;
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7242 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7243
5353 df230b7df93c [project @ 2005-05-18 02:18:24 by jwe] jwe parents: 5338 diff changeset	7244 int
6757 c3cd7d14fc5e [project @ 2007-06-25 19:06:42 by jwe] jwe parents: 6708 diff changeset	7245 octave_stream_list::insert (octave_stream& os)
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7246 {
5353 df230b7df93c [project @ 2005-05-18 02:18:24 by jwe] jwe parents: 5338 diff changeset	7247 return (instance_ok ()) ? instance->do_insert (os) : -1;
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7248 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7249
3340 585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	7250 octave_stream
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	7251 octave_stream_list::lookup (int fid, const std::string& who)
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7252 {
3341 14cfc9475fe4 [project @ 1999-11-05 08:11:58 by jwe] jwe parents: 3340 diff changeset	7253 return (instance_ok ()) ? instance->do_lookup (fid, who) : octave_stream ();
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7254 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7255
3340 585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	7256 octave_stream
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	7257 octave_stream_list::lookup (const octave_value& fid, const std::string& who)
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7258 {
3341 14cfc9475fe4 [project @ 1999-11-05 08:11:58 by jwe] jwe parents: 3340 diff changeset	7259 return (instance_ok ()) ? instance->do_lookup (fid, who) : octave_stream ();
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7260 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7261
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7262 int
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	7263 octave_stream_list::remove (int fid, const std::string& who)
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7264 {
3341 14cfc9475fe4 [project @ 1999-11-05 08:11:58 by jwe] jwe parents: 3340 diff changeset	7265 return (instance_ok ()) ? instance->do_remove (fid, who) : -1;
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7266 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7267
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7268 int
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	7269 octave_stream_list::remove (const octave_value& fid, const std::string& who)
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7270 {
3341 14cfc9475fe4 [project @ 1999-11-05 08:11:58 by jwe] jwe parents: 3340 diff changeset	7271 return (instance_ok ()) ? instance->do_remove (fid, who) : -1;
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7272 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7273
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7274 void
8902 5d5db7a347c6 erase closed files from file list & cache lookup Jaroslav Hajek <highegg@gmail.com> parents: 8773 diff changeset	7275 octave_stream_list::clear (bool flush)
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7276 {
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7277 if (instance)
8902 5d5db7a347c6 erase closed files from file list & cache lookup Jaroslav Hajek <highegg@gmail.com> parents: 8773 diff changeset	7278 instance->do_clear (flush);
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7279 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7280
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7281 string_vector
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7282 octave_stream_list::get_info (int fid)
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7283 {
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7284 return (instance_ok ()) ? instance->do_get_info (fid) : string_vector ();
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7285 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7286
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7287 string_vector
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7288 octave_stream_list::get_info (const octave_value& fid)
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7289 {
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7290 return (instance_ok ()) ? instance->do_get_info (fid) : string_vector ();
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7291 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7292
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3535 diff changeset	7293 std::string
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7294 octave_stream_list::list_open_files (void)
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7295 {
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20982 diff changeset	7296 return (instance_ok ()) ? instance->do_list_open_files () : "";
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7297 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7298
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7299 octave_value
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7300 octave_stream_list::open_file_numbers (void)
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7301 {
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7302 return (instance_ok ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7303 ? instance->do_open_file_numbers () : octave_value ();
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7304 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7305
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7306 int
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7307 octave_stream_list::get_file_number (const octave_value& fid)
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7308 {
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7309 return (instance_ok ()) ? instance->do_get_file_number (fid) : -1;
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7310 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	7311
5353 df230b7df93c [project @ 2005-05-18 02:18:24 by jwe] jwe parents: 5338 diff changeset	7312 int
6757 c3cd7d14fc5e [project @ 2007-06-25 19:06:42 by jwe] jwe parents: 6708 diff changeset	7313 octave_stream_list::do_insert (octave_stream& os)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7314 {
6757 c3cd7d14fc5e [project @ 2007-06-25 19:06:42 by jwe] jwe parents: 6708 diff changeset	7315 // Insert item with key corresponding to file-descriptor.
c3cd7d14fc5e [project @ 2007-06-25 19:06:42 by jwe] jwe parents: 6708 diff changeset	7316
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	7317 int stream_number = os.file_number ();
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	7318
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	7319 if (stream_number == -1)
6757 c3cd7d14fc5e [project @ 2007-06-25 19:06:42 by jwe] jwe parents: 6708 diff changeset	7320 return stream_number;
c3cd7d14fc5e [project @ 2007-06-25 19:06:42 by jwe] jwe parents: 6708 diff changeset	7321
19864 17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	7322 // Should we test for
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	7323 //
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	7324 // (list.find (stream_number) != list.end ()
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	7325 // && list[stream_number].is_open ())
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	7326 //
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	7327 // and respond with "error ("internal error: ...")"? It should not
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	7328 // happen except for some bug or if the user has opened a stream with
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	7329 // an interpreted command, but closed it directly with a system call
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	7330 // in an oct-file; then the kernel knows the fd is free, but Octave
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	7331 // does not know. If it happens, it should not do harm here to simply
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	7332 // overwrite this entry, although the wrong entry might have done harm
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	7333 // before.
6757 c3cd7d14fc5e [project @ 2007-06-25 19:06:42 by jwe] jwe parents: 6708 diff changeset	7334
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7335 if (list.size () >= list.max_size ())
20938 aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	7336 ::error ("could not create file id");
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7337
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7338 list[stream_number] = os;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7339
5353 df230b7df93c [project @ 2005-05-18 02:18:24 by jwe] jwe parents: 5338 diff changeset	7340 return stream_number;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7341 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7342
21040 3e7cfee5f786 maint: Rename attributes GCC_ATTR_XXX to OCTAVE_XXX. Rik <rik@octave.org> parents: 21029 diff changeset	7343 OCTAVE_NORETURN static
21029 e3b3bb522d62 maint: Move GCC_ attributes to start of declaration for future compatibility. Rik <rik@octave.org> parents: 21017 diff changeset	7344 void
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	7345 err_invalid_file_id (int fid, const std::string& who)
3341 14cfc9475fe4 [project @ 1999-11-05 08:11:58 by jwe] jwe parents: 3340 diff changeset	7346 {
14cfc9475fe4 [project @ 1999-11-05 08:11:58 by jwe] jwe parents: 3340 diff changeset	7347 if (who.empty ())
14cfc9475fe4 [project @ 1999-11-05 08:11:58 by jwe] jwe parents: 3340 diff changeset	7348 ::error ("invalid stream number = %d", fid);
14cfc9475fe4 [project @ 1999-11-05 08:11:58 by jwe] jwe parents: 3340 diff changeset	7349 else
14cfc9475fe4 [project @ 1999-11-05 08:11:58 by jwe] jwe parents: 3340 diff changeset	7350 ::error ("%s: invalid stream number = %d", who.c_str (), fid);
14cfc9475fe4 [project @ 1999-11-05 08:11:58 by jwe] jwe parents: 3340 diff changeset	7351 }
14cfc9475fe4 [project @ 1999-11-05 08:11:58 by jwe] jwe parents: 3340 diff changeset	7352
3340 585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	7353 octave_stream
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	7354 octave_stream_list::do_lookup (int fid, const std::string& who) const
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7355 {
3340 585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	7356 octave_stream retval;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7357
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7358 if (fid < 0)
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	7359 err_invalid_file_id (fid, who);
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7360
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7361 if (lookup_cache != list.end () && lookup_cache->first == fid)
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7362 retval = lookup_cache->second;
3341 14cfc9475fe4 [project @ 1999-11-05 08:11:58 by jwe] jwe parents: 3340 diff changeset	7363 else
6757 c3cd7d14fc5e [project @ 2007-06-25 19:06:42 by jwe] jwe parents: 6708 diff changeset	7364 {
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7365 ostrl_map::const_iterator iter = list.find (fid);
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7366
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7367 if (iter == list.end ())
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	7368 err_invalid_file_id (fid, who);
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7369
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7370 retval = iter->second;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7371 lookup_cache = iter;
6757 c3cd7d14fc5e [project @ 2007-06-25 19:06:42 by jwe] jwe parents: 6708 diff changeset	7372 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7373
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7374 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7375 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7376
3340 585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	7377 octave_stream
3341 14cfc9475fe4 [project @ 1999-11-05 08:11:58 by jwe] jwe parents: 3340 diff changeset	7378 octave_stream_list::do_lookup (const octave_value& fid,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7379 const std::string& who) const
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7380 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7381 int i = get_file_number (fid);
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7382
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	7383 return do_lookup (i, who);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7384 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7385
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7386 int
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	7387 octave_stream_list::do_remove (int fid, const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7388 {
20764 0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7389 // Can't remove stdin (std::cin), stdout (std::cout), or stderr (std::cerr).
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	7390 if (fid < 3)
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	7391 err_invalid_file_id (fid, who);
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7392
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7393 ostrl_map::iterator iter = list.find (fid);
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7394
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7395 if (iter == list.end ())
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	7396 err_invalid_file_id (fid, who);
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7397
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7398 octave_stream os = iter->second;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7399 list.erase (iter);
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7400 lookup_cache = list.end ();
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7401
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7402 // FIXME: is this check redundant?
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7403 if (! os.is_valid ())
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	7404 err_invalid_file_id (fid, who);
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7405
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7406 os.close ();
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7407
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	7408 return 0;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7409 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7410
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7411 int
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	7412 octave_stream_list::do_remove (const octave_value& fid, const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7413 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7414 int retval = -1;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7415
6054 769b203ede37 [project @ 2006-10-16 17:53:53 by jwe] jwe parents: 5887 diff changeset	7416 if (fid.is_string () && fid.string_value () == "all")
769b203ede37 [project @ 2006-10-16 17:53:53 by jwe] jwe parents: 5887 diff changeset	7417 {
8902 5d5db7a347c6 erase closed files from file list & cache lookup Jaroslav Hajek <highegg@gmail.com> parents: 8773 diff changeset	7418 do_clear (false);
6054 769b203ede37 [project @ 2006-10-16 17:53:53 by jwe] jwe parents: 5887 diff changeset	7419
769b203ede37 [project @ 2006-10-16 17:53:53 by jwe] jwe parents: 5887 diff changeset	7420 retval = 0;
769b203ede37 [project @ 2006-10-16 17:53:53 by jwe] jwe parents: 5887 diff changeset	7421 }
769b203ede37 [project @ 2006-10-16 17:53:53 by jwe] jwe parents: 5887 diff changeset	7422 else
769b203ede37 [project @ 2006-10-16 17:53:53 by jwe] jwe parents: 5887 diff changeset	7423 {
769b203ede37 [project @ 2006-10-16 17:53:53 by jwe] jwe parents: 5887 diff changeset	7424 int i = get_file_number (fid);
769b203ede37 [project @ 2006-10-16 17:53:53 by jwe] jwe parents: 5887 diff changeset	7425
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20465 diff changeset	7426 retval = do_remove (i, who);
6054 769b203ede37 [project @ 2006-10-16 17:53:53 by jwe] jwe parents: 5887 diff changeset	7427 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7428
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7429 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7430 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7431
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7432 void
8902 5d5db7a347c6 erase closed files from file list & cache lookup Jaroslav Hajek <highegg@gmail.com> parents: 8773 diff changeset	7433 octave_stream_list::do_clear (bool flush)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7434 {
8902 5d5db7a347c6 erase closed files from file list & cache lookup Jaroslav Hajek <highegg@gmail.com> parents: 8773 diff changeset	7435 if (flush)
5d5db7a347c6 erase closed files from file list & cache lookup Jaroslav Hajek <highegg@gmail.com> parents: 8773 diff changeset	7436 {
20764 0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7437 // Flush stdout and stderr.
8902 5d5db7a347c6 erase closed files from file list & cache lookup Jaroslav Hajek <highegg@gmail.com> parents: 8773 diff changeset	7438 list[1].flush ();
20764 0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7439 list[2].flush ();
8902 5d5db7a347c6 erase closed files from file list & cache lookup Jaroslav Hajek <highegg@gmail.com> parents: 8773 diff changeset	7440 }
5d5db7a347c6 erase closed files from file list & cache lookup Jaroslav Hajek <highegg@gmail.com> parents: 8773 diff changeset	7441
20764 0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7442 for (ostrl_map::iterator iter = list.begin (); iter != list.end (); )
6757 c3cd7d14fc5e [project @ 2007-06-25 19:06:42 by jwe] jwe parents: 6708 diff changeset	7443 {
8902 5d5db7a347c6 erase closed files from file list & cache lookup Jaroslav Hajek <highegg@gmail.com> parents: 8773 diff changeset	7444 int fid = iter->first;
20764 0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7445 if (fid < 3) // Don't delete stdin, stdout, stderr
0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7446 {
0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7447 iter++;
0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7448 continue;
0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7449 }
0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7450
8902 5d5db7a347c6 erase closed files from file list & cache lookup Jaroslav Hajek <highegg@gmail.com> parents: 8773 diff changeset	7451 octave_stream os = iter->second;
20768 7655b399abff eliminate trailing whitespace in source files we maintain John W. Eaton <jwe@octave.org> parents: 20764 diff changeset	7452
7655b399abff eliminate trailing whitespace in source files we maintain John W. Eaton <jwe@octave.org> parents: 20764 diff changeset	7453 std::string name = os.name ();
20764 0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7454 std::transform (name.begin (), name.end (), name.begin (), tolower);
0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7455
0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7456 // FIXME: This test for gnuplot is hardly foolproof.
0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7457 if (name.find ("gnuplot") != std::string::npos)
0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7458 {
0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7459 // Don't close down pipes to gnuplot
0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7460 iter++;
0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7461 continue;
0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7462 }
0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7463
0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7464 // Normal file handle. Close and delete from list.
0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7465 if (os.is_valid ())
8902 5d5db7a347c6 erase closed files from file list & cache lookup Jaroslav Hajek <highegg@gmail.com> parents: 8773 diff changeset	7466 os.close ();
20764 0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7467
0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7468 list.erase (iter++);
6757 c3cd7d14fc5e [project @ 2007-06-25 19:06:42 by jwe] jwe parents: 6708 diff changeset	7469 }
20764 0ad449bc8848 Stop 'fclose ("all")' from closing down gnuplot pipes (bug #39504). Rik <rik@octave.org> parents: 20756 diff changeset	7470
8902 5d5db7a347c6 erase closed files from file list & cache lookup Jaroslav Hajek <highegg@gmail.com> parents: 8773 diff changeset	7471 lookup_cache = list.end ();
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7472 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7473
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7474 string_vector
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7475 octave_stream_list::do_get_info (int fid) const
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7476 {
22837 b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7477 string_vector retval (3);
b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7478
b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7479 if (fid < 0)
b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7480 return retval;
b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7481
b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7482 octave_stream os;
b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7483 if (lookup_cache != list.end () && lookup_cache->first == fid)
b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7484 os = lookup_cache->second;
b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7485 else
b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7486 {
b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7487 ostrl_map::const_iterator iter = list.find (fid);
b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7488
b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7489 if (iter == list.end ())
b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7490 return retval;
b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7491
b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7492 os = iter->second;
b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7493 lookup_cache = iter;
b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7494 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7495
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20831 diff changeset	7496 if (! os.is_valid ())
22837 b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7497 return retval;
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20831 diff changeset	7498
c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20831 diff changeset	7499 retval(0) = os.name ();
c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20831 diff changeset	7500 retval(1) = octave_stream::mode_as_string (os.mode ());
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	7501 retval(2) = octave::mach_info::float_format_as_string (os.float_format ());
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20831 diff changeset	7502
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7503 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7504 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7505
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7506 string_vector
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7507 octave_stream_list::do_get_info (const octave_value& fid) const
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7508 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7509 int conv_err = 0;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7510
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7511 int int_fid = convert_to_valid_int (fid, conv_err);
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7512
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	7513 if (conv_err)
2915 649549662cf6 [project @ 1997-04-30 20:51:40 by jwe] jwe parents: 2902 diff changeset	7514 ::error ("file id must be a file object or integer value");
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7515
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	7516 return do_get_info (int_fid);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7517 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7518
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3535 diff changeset	7519 std::string
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7520 octave_stream_list::do_list_open_files (void) const
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7521 {
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	7522 std::ostringstream buf;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7523
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7524 buf << "\n"
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7525 << " number mode arch name\n"
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7526 << " ------ ---- ---- ----\n";
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7527
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	7528 for (const auto& fid_strm : list)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7529 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	7530 octave_stream os = fid_strm.second;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7531
4326 1cae4472c624 [project @ 2003-02-15 23:14:47 by jwe] jwe parents: 4312 diff changeset	7532 buf << " "
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7533 << std::setiosflags (std::ios::right)
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	7534 << std::setw (4) << fid_strm.first << " "
19123 c8f03ccdc9ee Align columns for freport() output. Rik <rik@octave.org> parents: 18676 diff changeset	7535 // reset necessary in addition to setiosflags since this is one stmt.
c8f03ccdc9ee Align columns for freport() output. Rik <rik@octave.org> parents: 18676 diff changeset	7536 << std::resetiosflags (std::ios::adjustfield)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7537 << std::setiosflags (std::ios::left)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7538 << std::setw (3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7539 << octave_stream::mode_as_string (os.mode ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7540 << " "
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7541 << std::setw (9)
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	7542 << octave::mach_info::float_format_as_string (os.float_format ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7543 << " "
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7544 << os.name () << "\n";
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7545 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7546
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	7547 buf << "\n";
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	7548
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	7549 return buf.str ();
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7550 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7551
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7552 octave_value
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7553 octave_stream_list::do_open_file_numbers (void) const
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7554 {
6757 c3cd7d14fc5e [project @ 2007-06-25 19:06:42 by jwe] jwe parents: 6708 diff changeset	7555 Matrix retval (1, list.size (), 0.0);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7556
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7557 int num_open = 0;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7558
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	7559 for (const auto& fid_strm : list)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7560 {
6757 c3cd7d14fc5e [project @ 2007-06-25 19:06:42 by jwe] jwe parents: 6708 diff changeset	7561 // Skip stdin, stdout, and stderr.
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	7562 if (fid_strm.first > 2 && fid_strm.second)
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	7563 retval(0, num_open++) = fid_strm.first;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7564 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7565
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7566 retval.resize ((num_open > 0), num_open);
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7567
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7568 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7569 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7570
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7571 int
2609 12bc9d0a50b5 [project @ 1997-01-18 00:17:36 by jwe] jwe parents: 2601 diff changeset	7572 octave_stream_list::do_get_file_number (const octave_value& fid) const
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7573 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7574 int retval = -1;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7575
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7576 if (fid.is_string ())
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7577 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	7578 std::string nm = fid.string_value ();
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7579
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	7580 for (const auto& fid_strm : list)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7581 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	7582 // stdin, stdout, and stderr are unnamed.
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	7583 if (fid_strm.first > 2)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7584 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	7585 octave_stream os = fid_strm.second;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7586
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7587 if (os && os.name () == nm)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7588 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	7589 retval = fid_strm.first;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7590 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7591 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7592 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7593 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7594 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7595 else
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7596 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7597 int conv_err = 0;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7598
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7599 int int_fid = convert_to_valid_int (fid, conv_err);
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7600
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7601 if (conv_err)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	7602 ::error ("file id must be a file object, std::string, or integer value");
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	7603
69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	7604 retval = int_fid;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7605 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7606
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7607 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7608 }
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	7609

Mercurial > octave

annotate libinterp/corefcn/oct-stream.cc @ 22868:87e3163f6c87