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

annotate libinterp/corefcn/oct-stream.cc @ 24304:ddaee520d342

maint: merge stable to default.

author	Rik <rik@octave.org>
date	Fri, 24 Nov 2017 17:29:00 -0800
parents	89167cc74260 ddc91a2ee0e0
children	f77da8da0f3f

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
23219 3ac9f9ecfae5 maint: Update copyright dates. John W. Eaton <jwe@octave.org> parents: 23083 diff changeset	3 Copyright (C) 1996-2017 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
24303 ddc91a2ee0e0 Remove all delimiters from whitespace list in textscan function (bug #52479). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24175 diff changeset	32 #include <algorithm>
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	33 #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	34 #include <fstream>
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3491 diff changeset	35 #include <iomanip>
9202 4b2147b25e8d clean up Array instantiation mess in oct-stream.cc Jaroslav Hajek <highegg@gmail.com> parents: 9017 diff changeset	36 #include <iostream>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	37 #include <sstream>
3535 c5ebcd5d25a9 [project @ 2000-02-02 11:55:49 by jwe] jwe parents: 3534 diff changeset	38 #include <string>
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	39
19269 65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 19123 diff changeset	40 #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	41 #include "Cell.h"
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	42 #include "byte-swap.h"
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	43 #include "lo-ieee.h"
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	44 #include "lo-mappers.h"
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	45 #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	46 #include "oct-locbuf.h"
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13271 diff changeset	47 #include "quit.h"
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13271 diff changeset	48 #include "singleton-cleanup.h"
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	49 #include "str-vec.h"
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	50
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	51 #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	52 #include "errwarn.h"
3342 d8d3700fb4ab [project @ 1999-11-05 16:55:17 by jwe] jwe parents: 3341 diff changeset	53 #include "input.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: 22089 diff changeset	54 #include "interpreter.h"
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	55 #include "octave.h"
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	56 #include "oct-iostrm.h"
3775 13905c3a24af [project @ 2001-02-06 01:56:59 by jwe] jwe parents: 3716 diff changeset	57 #include "oct-stdstrm.h"
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	58 #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	59 #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	60 #include "ovl.h"
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	61 #include "pager.h"
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	62 #include "utils.h"
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	63
20938 aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	64 // 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	65 // in the stream code. When invoked with "error (...)" the member
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	66 // function from octave::stream or octave::base_stream is called. This
20938 aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	67 // 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	68 // 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	69 // 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	70 // 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	71 // 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	72 // 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	73
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	74 // Possible values for conv_err:
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	75 //
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	76 // 1 : not a real scalar
2902 c5b7a019b9ed [project @ 1997-04-30 03:46:53 by jwe] jwe parents: 2877 diff changeset	77 // 2 : value is NaN
c5b7a019b9ed [project @ 1997-04-30 03:46:53 by jwe] jwe parents: 2877 diff changeset	78 // 3 : value is not an integer
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	79
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	80 static int
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	81 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	82 {
20747 ee2743bd07a8 eliminate various compiler warnings John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	83 conv_err = 0;
ee2743bd07a8 eliminate various compiler warnings John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	84
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	85 int retval = 0;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	86
20747 ee2743bd07a8 eliminate various compiler warnings John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	87 double dval = 0.0;
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	88
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	89 try
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	90 {
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	91 dval = tc.double_value ();
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	92 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	93 catch (const octave::execution_exception&)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	94 {
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	95 octave::interpreter::recover_from_exception ();
20756 200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20747 diff changeset	96
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	97 conv_err = 1;
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	98 }
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20714 diff changeset	99
20747 ee2743bd07a8 eliminate various compiler warnings John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	100 if (! conv_err)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	101 {
5389 25c8956d2204 [project @ 2005-06-15 03:45:46 by jwe] jwe parents: 5353 diff changeset	102 if (! lo_ieee_isnan (dval))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	103 {
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21777 diff changeset	104 int ival = octave::math::nint (dval);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	105
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	106 if (ival == dval)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	107 retval = ival;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	108 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	109 conv_err = 3;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	110 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	111 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	112 conv_err = 2;
2117 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 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	116 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	117
22996 36df0e0072a5 distinguish elements vs. bytes in fread (bug #49699) John W. Eaton <jwe@octave.org> parents: 22407 diff changeset	118 static octave_idx_type
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	119 get_size (double d, const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	120 {
22996 36df0e0072a5 distinguish elements vs. bytes in fread (bug #49699) John W. Eaton <jwe@octave.org> parents: 22407 diff changeset	121 octave_idx_type retval = -1;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	122
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	123 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	124 ::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	125
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21777 diff changeset	126 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	127 retval = -1;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	128 else
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	129 {
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	130 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	131 ::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	132 who.c_str ());
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	133
22996 36df0e0072a5 distinguish elements vs. bytes in fread (bug #49699) John W. Eaton <jwe@octave.org> parents: 22407 diff changeset	134 if (d > std::numeric_limits<octave_idx_type>::max ())
36df0e0072a5 distinguish elements vs. bytes in fread (bug #49699) John W. Eaton <jwe@octave.org> parents: 22407 diff changeset	135 ::error ("%s: dimension too large for Octave's index type",
36df0e0072a5 distinguish elements vs. bytes in fread (bug #49699) John W. Eaton <jwe@octave.org> parents: 22407 diff changeset	136 who.c_str ());
36df0e0072a5 distinguish elements vs. bytes in fread (bug #49699) John W. Eaton <jwe@octave.org> parents: 22407 diff changeset	137
36df0e0072a5 distinguish elements vs. bytes in fread (bug #49699) John W. Eaton <jwe@octave.org> parents: 22407 diff changeset	138 retval = octave::math::nint_big (d);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	139 }
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 return retval;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	142 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	143
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	144 static void
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	145 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	146 bool& one_elt_size_spec, const std::string& who)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	147 {
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	148 nr = -1;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	149 nc = -1;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	150
3268 fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	151 one_elt_size_spec = false;
fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	152
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	153 double dnr = -1.0;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	154 double dnc = -1.0;
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	155
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20230 diff changeset	156 octave_idx_type sz_len = size.numel ();
3810 f19f00339363 [project @ 2001-03-29 21:03:01 by jwe] jwe parents: 3779 diff changeset	157
f19f00339363 [project @ 2001-03-29 21:03:01 by jwe] jwe parents: 3779 diff changeset	158 if (sz_len == 1)
2601 3723512a827a [project @ 1997-01-06 05:43:16 by jwe] jwe parents: 2600 diff changeset	159 {
3268 fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	160 one_elt_size_spec = true;
fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3267 diff changeset	161
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	162 dnr = size(0);
4293 977f977fb2c3 [project @ 2003-01-06 18:18:14 by jwe] jwe parents: 4257 diff changeset	163
977f977fb2c3 [project @ 2003-01-06 18:18:14 by jwe] jwe parents: 4257 diff changeset	164 dnc = (dnr == 0.0) ? 0.0 : 1.0;
2601 3723512a827a [project @ 1997-01-06 05:43:16 by jwe] jwe parents: 2600 diff changeset	165 }
3810 f19f00339363 [project @ 2001-03-29 21:03:01 by jwe] jwe parents: 3779 diff changeset	166 else if (sz_len == 2)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	167 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	168 dnr = size(0);
3810 f19f00339363 [project @ 2001-03-29 21:03:01 by jwe] jwe parents: 3779 diff changeset	169
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21777 diff changeset	170 if (octave::math::isinf (dnr))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	171 ::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	172
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20946 diff changeset	173 dnc = size(1);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	174 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	175 else
4468 efb6301dae80 [project @ 2003-07-15 19:18:20 by jwe] jwe parents: 4425 diff changeset	176 ::error ("%s: invalid size specification", who.c_str ());
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	177
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20465 diff changeset	178 nr = get_size (dnr, who);
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20465 diff changeset	179
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20465 diff changeset	180 if (dnc >= 0.0)
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20465 diff changeset	181 nc = get_size (dnc, who);
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	182 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	183
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	184
3535 c5ebcd5d25a9 [project @ 2000-02-02 11:55:49 by jwe] jwe parents: 3534 diff changeset	185 static std::string
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	186 expand_char_class (const std::string& s)
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	187 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	188 std::string retval;
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	189
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	190 size_t len = s.length ();
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	191
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	192 size_t i = 0;
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	193
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	194 while (i < len)
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	195 {
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	196 unsigned char c = s[i++];
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	197
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	198 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	199 && ( 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	200 <= static_cast<unsigned char> (s[i])))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	201 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	202 // 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	203 // already added it below).
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	204
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	205 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	206 retval += c;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	207 }
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	208 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	209 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	210 // 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	211 // the last character in the class.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	212
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	213 if (c != '-' \|\| i == len)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	214 retval += c;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	215 }
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	216 }
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	217
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	218 return retval;
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	219 }
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	220
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	221 namespace octave
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	222 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	223 class
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	224 scanf_format_elt
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	225 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	226 public:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	227
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	228 enum special_conversion
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	229 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	230 whitespace_conversion = 1,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	231 literal_conversion = 2,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	232 null = 3
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	233 };
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	234
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23450 diff changeset	235 scanf_format_elt (const char *txt = nullptr, int w = 0, bool d = false,
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	236 char typ = '\0', char mod = '\0',
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	237 const std::string& ch_class = "")
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	238 : text (strsave (txt)), width (w), discard (d), type (typ),
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	239 modifier (mod), char_class (ch_class)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	240 { }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	241
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	242 scanf_format_elt (const scanf_format_elt& e)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	243 : text (strsave (e.text)), width (e.width), discard (e.discard),
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	244 type (e.type), modifier (e.modifier), char_class (e.char_class)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	245 { }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	246
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	247 scanf_format_elt& operator = (const scanf_format_elt& e)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	248 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	249 if (this != &e)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	250 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	251 text = strsave (e.text);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	252 width = e.width;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	253 discard = e.discard;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	254 type = e.type;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	255 modifier = e.modifier;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	256 char_class = e.char_class;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	257 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	258
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	259 return *this;
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	260 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	261
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	262 ~scanf_format_elt (void) { delete [] text; }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	263
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	264 // The C-style format string.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	265 const char *text;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	266
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	267 // The maximum field width.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	268 int width;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	269
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	270 // TRUE if we are not storing the result of this conversion.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	271 bool discard;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	272
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	273 // Type of conversion -- 'd', 'i', 'o', 'u', 'x', 'e', 'f', 'g',
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	274 // 'c', 's', 'p', '%', or '['.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	275 char type;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	276
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	277 // A length modifier -- 'h', 'l', or 'L'.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	278 char modifier;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	279
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	280 // The class of characters in a '[' format.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	281 std::string char_class;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	282 };
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	283
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	284 class
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	285 scanf_format_list
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	286 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	287 public:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	288
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	289 scanf_format_list (const std::string& fmt = "");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	290
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	291 // No copying!
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	292
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	293 scanf_format_list (const scanf_format_list&) = delete;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	294
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	295 scanf_format_list& operator = (const scanf_format_list&) = delete;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	296
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	297 ~scanf_format_list (void);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	298
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	299 octave_idx_type num_conversions (void) { return nconv; }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	300
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	301 // The length can be different than the number of conversions.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	302 // For example, "x %d y %d z" has 2 conversions but the length of
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	303 // the list is 3 because of the characters that appear after the
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	304 // last conversion.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	305
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	306 size_t length (void) const { return fmt_elts.size (); }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	307
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	308 const scanf_format_elt * first (void)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	309 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	310 curr_idx = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	311 return current ();
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	312 }
d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	313
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	314 const scanf_format_elt * current (void) const
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	315 {
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23792 diff changeset	316 return length () > 0 ? fmt_elts[curr_idx] : nullptr;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	317 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	318
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	319 const scanf_format_elt * next (bool cycle = true)
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	320 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	321 static scanf_format_elt dummy
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23795 diff changeset	322 (nullptr, 0, false, scanf_format_elt::null, '\0', "");
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	323
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	324 curr_idx++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	325
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	326 if (curr_idx >= length ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	327 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	328 if (cycle)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	329 curr_idx = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	330 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	331 return &dummy;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	332 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	333
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	334 return current ();
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	335 }
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	336
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	337 void printme (void) const;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	338
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	339 bool ok (void) const { return (nconv >= 0); }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	340
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	341 operator bool () const { return ok (); }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	342
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	343 bool all_character_conversions (void);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	344
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	345 bool all_numeric_conversions (void);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	346
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	347 private:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	348
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	349 // Number of conversions specified by this format string, or -1 if
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	350 // invalid conversions have been found.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	351 octave_idx_type nconv;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	352
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	353 // Index to current element;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	354 size_t curr_idx;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	355
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	356 // List of format elements.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	357 std::deque<scanf_format_elt*> fmt_elts;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	358
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	359 // Temporary buffer.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	360 std::ostringstream buf;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	361
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	362 void add_elt_to_list (int width, bool discard, char type, char modifier,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	363 const std::string& char_class = "");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	364
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	365 void process_conversion (const std::string& s, size_t& i, size_t n,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	366 int& width, bool& discard, char& type,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	367 char& modifier);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	368
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	369 int finish_conversion (const std::string& s, size_t& i, size_t n,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	370 int& width, bool discard, char& type,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	371 char modifier);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	372 };
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	373
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	374 scanf_format_list::scanf_format_list (const std::string& s)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	375 : nconv (0), curr_idx (0), fmt_elts (), buf ()
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	376 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	377 size_t n = s.length ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	378
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	379 size_t i = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	380
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	381 int width = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	382 bool discard = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	383 char modifier = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	384 char type = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	385
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	386 bool have_more = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	387
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	388 while (i < n)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	389 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	390 have_more = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	391
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	392 if (s[i] == '%')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	393 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	394 // Process percent-escape conversion type.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	395
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	396 process_conversion (s, i, n, width, discard, type, modifier);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	397
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	398 have_more = (buf.tellp () != 0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	399 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	400 else if (isspace (s[i]))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	401 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	402 type = scanf_format_elt::whitespace_conversion;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	403
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	404 width = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	405 discard = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	406 modifier = '\0';
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	407 buf << ' ';
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	408
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	409 while (++i < n && isspace (s[i]))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	410 ; // skip whitespace
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	411
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	412 add_elt_to_list (width, discard, type, modifier);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	413
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	414 have_more = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	415 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	416 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	417 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	418 type = scanf_format_elt::literal_conversion;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	419
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	420 width = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	421 discard = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	422 modifier = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	423
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	424 while (i < n && ! isspace (s[i]) && s[i] != '%')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	425 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	426
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	427 add_elt_to_list (width, discard, type, modifier);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	428
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	429 have_more = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	430 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	431
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	432 if (nconv < 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	433 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	434 have_more = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	435 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	436 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	437 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	438
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	439 if (have_more)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	440 add_elt_to_list (width, discard, type, modifier);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	441
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	442 buf.clear ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	443 buf.str ("");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	444 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	445
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	446 scanf_format_list::~scanf_format_list (void)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	447 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	448 size_t n = fmt_elts.size ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	449
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	450 for (size_t i = 0; i < n; i++)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	451 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	452 scanf_format_elt *elt = fmt_elts[i];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	453 delete elt;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	454 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	455 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	456
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	457 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	458 scanf_format_list::add_elt_to_list (int width, bool discard, char type,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	459 char modifier,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	460 const std::string& char_class)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	461 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	462 std::string text = buf.str ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	463
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	464 if (! text.empty ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	465 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	466 scanf_format_elt *elt
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	467 = new scanf_format_elt (text.c_str (), width, discard, type,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	468 modifier, char_class);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	469
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	470 fmt_elts.push_back (elt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	471 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	472
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	473 buf.clear ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	474 buf.str ("");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	475 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	476
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	477 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	478 scanf_format_list::process_conversion (const std::string& s, size_t& i,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	479 size_t n, int& width, bool& discard,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	480 char& type, char& modifier)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	481 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	482 width = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	483 discard = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	484 modifier = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	485 type = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	486
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	487 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	488
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	489 bool have_width = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	490
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	491 while (i < n)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	492 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	493 switch (s[i])
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	494 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	495 case '*':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	496 if (discard)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	497 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	498 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	499 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	500 discard = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	501 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	502 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	503 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	504
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	505 case '0': case '1': case '2': case '3': case '4':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	506 case '5': case '6': case '7': case '8': case '9':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	507 if (have_width)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	508 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	509 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	510 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	511 char c = s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	512 width = 10 * width + c - '0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	513 have_width = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	514 buf << c;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	515 while (i < n && isdigit (s[i]))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	516 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	517 c = s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	518 width = 10 * width + c - '0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	519 buf << c;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	520 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	521 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	522 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	523
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	524 case 'h': case 'l': case 'L':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	525 if (modifier != '\0')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	526 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	527 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	528 modifier = s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	529 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	530
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	531 case 'd': case 'i': case 'o': case 'u': case 'x':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	532 if (modifier == 'L')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	533 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	534 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	535 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	536 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	537 goto fini;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	538
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	539 case 'e': case 'f': case 'g':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	540 if (modifier == 'h')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	541 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	542 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	543 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	544 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	545
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	546 // No float or long double conversions, thanks.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	547 buf << 'l';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	548
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	549 goto fini;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	550
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	551 case 'c': case 's': case 'p': case '%': case '[':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	552 if (modifier != '\0')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	553 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	554 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	555 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	556 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	557 goto fini;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	558
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	559 fini:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	560 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	561 if (finish_conversion (s, i, n, width, discard,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	562 type, modifier) == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	563 return;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	564 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	565 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	566
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	567 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	568 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	569 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	570 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	571
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	572 if (nconv < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	573 break;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	574 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	575
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	576 nconv = -1;
21477 4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	577 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	578
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	579 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	580 scanf_format_list::finish_conversion (const std::string& s, size_t& i,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	581 size_t n, int& width, bool discard,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	582 char& type, char modifier)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	583 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	584 int retval = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	585
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	586 std::string char_class;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	587
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	588 size_t beg_idx = std::string::npos;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	589 size_t end_idx = std::string::npos;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	590
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	591 if (s[i] == '%')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	592 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	593 type = '%';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	594 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	595 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	596 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	597 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	598 type = s[i];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	599
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	600 if (s[i] == '[')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	601 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	602 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	603
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	604 if (i < n)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	605 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	606 beg_idx = i;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	607
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	608 if (s[i] == '^')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	609 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	610 type = '^';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	611 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	612
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	613 if (i < n)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	614 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	615 beg_idx = i;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	616
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	617 if (s[i] == ']')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	618 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	619 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	620 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	621 else if (s[i] == ']')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	622 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	623 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	624
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	625 while (i < n && s[i] != ']')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	626 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	627
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	628 if (i < n && s[i] == ']')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	629 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	630 end_idx = i-1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	631 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	632 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	633
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	634 if (s[i-1] != ']')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	635 retval = nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	636 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	637 else
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	638 buf << s[i++];
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	639
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	640 nconv++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	641 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	642
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	643 if (nconv >= 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	644 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	645 if (beg_idx != std::string::npos && end_idx != std::string::npos)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	646 char_class = expand_char_class (s.substr (beg_idx,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	647 end_idx - beg_idx + 1));
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	648
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	649 add_elt_to_list (width, discard, type, modifier, char_class);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	650 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	651
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	652 return retval;
21477 4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	653 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	654
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	655 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	656 scanf_format_list::printme (void) const
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	657 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	658 size_t n = fmt_elts.size ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	659
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	660 for (size_t i = 0; i < n; i++)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	661 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	662 scanf_format_elt *elt = fmt_elts[i];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	663
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	664 std::cerr
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	665 << "width: " << elt->width << "\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	666 << "discard: " << elt->discard << "\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	667 << "type: ";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	668
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	669 if (elt->type == scanf_format_elt::literal_conversion)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	670 std::cerr << "literal text\n";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	671 else if (elt->type == scanf_format_elt::whitespace_conversion)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	672 std::cerr << "whitespace\n";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	673 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	674 std::cerr << elt->type << "\n";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	675
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	676 std::cerr
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	677 << "modifier: " << elt->modifier << "\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	678 << "char_class: '" << undo_string_escapes (elt->char_class) << "'\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	679 << "text: '" << undo_string_escapes (elt->text) << "'\n\n";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	680 }
21477 4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	681 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	682
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	683 bool
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	684 scanf_format_list::all_character_conversions (void)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	685 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	686 size_t n = fmt_elts.size ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	687
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	688 if (n > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	689 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	690 for (size_t i = 0; i < n; i++)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	691 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	692 scanf_format_elt *elt = fmt_elts[i];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	693
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	694 switch (elt->type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	695 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	696 case 'c': case 's': case '%': case '[': case '^':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	697 case scanf_format_elt::literal_conversion:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	698 case scanf_format_elt::whitespace_conversion:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	699 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	700
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	701 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	702 return false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	703 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	704 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	705 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	706
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	707 return true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	708 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	709 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	710 return false;
21477 4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	711 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	712
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	713 bool
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	714 scanf_format_list::all_numeric_conversions (void)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	715 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	716 size_t n = fmt_elts.size ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	717
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	718 if (n > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	719 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	720 for (size_t i = 0; i < n; i++)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	721 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	722 scanf_format_elt *elt = fmt_elts[i];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	723
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	724 switch (elt->type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	725 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	726 case 'd': case 'i': case 'o': case 'u': case 'x':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	727 case 'e': case 'f': case 'g':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	728 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	729
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	730 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	731 return false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	732 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	733 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	734 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	735
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	736 return true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	737 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	738 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	739 return false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	740 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	741
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	742 class
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	743 printf_format_elt
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	744 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	745 public:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	746
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23450 diff changeset	747 printf_format_elt (const char *txt = nullptr, int n = 0, int w = -1,
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	748 int p = -1, const std::string& f = "",
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	749 char typ = '\0', char mod = '\0')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	750 : text (strsave (txt)), args (n), fw (w), prec (p), flags (f),
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	751 type (typ), modifier (mod)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	752 { }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	753
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	754 printf_format_elt (const printf_format_elt& e)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	755 : text (strsave (e.text)), args (e.args), fw (e.fw), prec (e.prec),
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	756 flags (e.flags), type (e.type), modifier (e.modifier)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	757 { }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	758
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	759 printf_format_elt& operator = (const printf_format_elt& e)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	760 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	761 if (this != &e)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	762 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	763 text = strsave (e.text);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	764 args = e.args;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	765 fw = e.fw;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	766 prec = e.prec;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	767 flags = e.flags;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	768 type = e.type;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	769 modifier = e.modifier;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	770 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	771
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	772 return *this;
4223 5ebaf7eee36e [project @ 2002-12-17 23:54:34 by jwe] jwe parents: 4153 diff changeset	773 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	774
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	775 ~printf_format_elt (void) { delete [] text; }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	776
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	777 // The C-style format string.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	778 const char *text;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	779
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	780 // How many args do we expect to consume?
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	781 int args;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	782
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	783 // Field width.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	784 int fw;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	785
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	786 // Precision.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	787 int prec;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	788
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	789 // Flags -- '-', '+', ' ', '0', or '#'.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	790 std::string flags;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	791
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	792 // Type of conversion -- 'd', 'i', 'o', 'x', 'X', 'u', 'c', 's',
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	793 // 'f', 'e', 'E', 'g', 'G', 'p', or '%'
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	794 char type;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	795
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	796 // A length modifier -- 'h', 'l', or 'L'.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	797 char modifier;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	798 };
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	799
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	800 class
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	801 printf_format_list
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	802 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	803 public:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	804
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	805 printf_format_list (const std::string& fmt = "");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	806
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	807 // No copying!
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	808
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	809 printf_format_list (const printf_format_list&) = delete;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	810
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	811 printf_format_list& operator = (const printf_format_list&) = delete;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	812
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	813 ~printf_format_list (void);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	814
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	815 octave_idx_type num_conversions (void) { return nconv; }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	816
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	817 const printf_format_elt * first (void)
4223 5ebaf7eee36e [project @ 2002-12-17 23:54:34 by jwe] jwe parents: 4153 diff changeset	818 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	819 curr_idx = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	820 return current ();
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	821 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	822
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	823 const printf_format_elt * current (void) const
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	824 {
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23792 diff changeset	825 return length () > 0 ? fmt_elts[curr_idx] : nullptr;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	826 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	827
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	828 size_t length (void) const { return fmt_elts.size (); }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	829
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	830 const printf_format_elt * next (bool cycle = true)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	831 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	832 curr_idx++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	833
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	834 if (curr_idx >= length ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	835 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	836 if (cycle)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	837 curr_idx = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	838 else
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23792 diff changeset	839 return nullptr;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	840 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	841
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	842 return current ();
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	843 }
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	844
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	845 bool last_elt_p (void) { return (curr_idx + 1 == length ()); }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	846
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	847 void printme (void) const;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	848
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	849 bool ok (void) const { return (nconv >= 0); }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	850
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	851 operator bool () const { return ok (); }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	852
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	853 private:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	854
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	855 // Number of conversions specified by this format string, or -1 if
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	856 // invalid conversions have been found.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	857 octave_idx_type nconv;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	858
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	859 // Index to current element;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	860 size_t curr_idx;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	861
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	862 // List of format elements.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	863 std::deque<printf_format_elt*> fmt_elts;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	864
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	865 // Temporary buffer.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	866 std::ostringstream buf;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	867
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	868 void add_elt_to_list (int args, const std::string& flags, int fw,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	869 int prec, char type, char modifier);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	870
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	871 void process_conversion (const std::string& s, size_t& i, size_t n,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	872 int& args, std::string& flags, int& fw,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	873 int& prec, char& modifier, char& type);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	874
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	875 void finish_conversion (const std::string& s, size_t& i, int args,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	876 const std::string& flags, int fw, int prec,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	877 char modifier, char& type);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	878 };
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	879
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	880 printf_format_list::printf_format_list (const std::string& s)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	881 : nconv (0), curr_idx (0), fmt_elts (), buf ()
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	882 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	883 size_t n = s.length ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	884
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	885 size_t i = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	886
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	887 int args = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	888 std::string flags;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	889 int fw = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	890 int prec = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	891 char modifier = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	892 char type = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	893
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	894 bool have_more = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	895 bool empty_buf = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	896
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	897 if (n == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	898 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	899 printf_format_elt *elt
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	900 = new printf_format_elt ("", args, fw, prec, flags, type, modifier);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	901
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	902 fmt_elts.push_back (elt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	903 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	904 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	905 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	906 while (i < n)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	907 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	908 have_more = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	909
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	910 empty_buf = (buf.tellp () == 0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	911
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	912 switch (s[i])
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	913 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	914 case '%':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	915 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	916 if (empty_buf)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	917 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	918 process_conversion (s, i, n, args, flags, fw, prec,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	919 type, modifier);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	920
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	921 // If there is nothing in the buffer, then
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	922 // add_elt_to_list must have just been called, so we
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	923 // are already done with the current element and we
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	924 // don't need to call add_elt_to_list if this is our
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	925 // last trip through the loop.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	926
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	927 have_more = (buf.tellp () != 0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	928 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	929 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	930 add_elt_to_list (args, flags, fw, prec, type, modifier);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	931 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	932 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	933
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	934 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	935 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	936 args = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	937 flags = "";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	938 fw = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	939 prec = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	940 modifier = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	941 type = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	942 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	943 empty_buf = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	944 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	945 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	946 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	947
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	948 if (nconv < 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	949 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	950 have_more = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	951 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	952 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	953 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	954
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	955 if (have_more)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	956 add_elt_to_list (args, flags, fw, prec, type, modifier);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	957
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	958 buf.clear ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	959 buf.str ("");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	960 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	961 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	962
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	963 printf_format_list::~printf_format_list (void)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	964 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	965 size_t n = fmt_elts.size ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	966
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	967 for (size_t i = 0; i < n; i++)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	968 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	969 printf_format_elt *elt = fmt_elts[i];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	970 delete elt;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	971 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	972 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	973
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	974 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	975 printf_format_list::add_elt_to_list (int args, const std::string& flags,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	976 int fw, int prec, char type,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	977 char modifier)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	978 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	979 std::string text = buf.str ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	980
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	981 if (! text.empty ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	982 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	983 printf_format_elt *elt
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	984 = new printf_format_elt (text.c_str (), args, fw, prec, flags,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	985 type, modifier);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	986
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	987 fmt_elts.push_back (elt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	988 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	989
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	990 buf.clear ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	991 buf.str ("");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	992 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	993
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	994 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	995 printf_format_list::process_conversion (const std::string& s, size_t& i,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	996 size_t n, int& args,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	997 std::string& flags, int& fw,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	998 int& prec, char& modifier,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	999 char& type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1000 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1001 args = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1002 flags = "";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1003 fw = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1004 prec = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1005 modifier = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1006 type = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1007
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1008 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1009
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1010 bool nxt = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1011
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1012 while (i < n)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1013 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1014 switch (s[i])
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1015 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1016 case '-': case '+': case ' ': case '0': case '#':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1017 flags += s[i];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1018 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1019 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1020
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1021 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1022 nxt = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1023 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1024 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1025
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1026 if (nxt)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1027 break;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1028 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1029
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1030 if (i < n)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1031 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1032 if (s[i] == '*')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1033 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1034 fw = -2;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1035 args++;
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	1036 buf << s[i++];
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1037 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1038 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1039 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1040 if (isdigit (s[i]))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1041 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1042 int nn = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1043 std::string tmp = s.substr (i);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1044 sscanf (tmp.c_str (), "%d%n", &fw, &nn);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1045 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1046
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1047 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	1048 buf << s[i++];
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1049 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1050 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1051
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1052 if (i < n && s[i] == '.')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1053 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1054 // nothing before the . means 0.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1055 if (fw == -1)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1056 fw = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1057
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1058 // . followed by nothing is 0.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1059 prec = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1060
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1061 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1062
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1063 if (i < n)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1064 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1065 if (s[i] == '*')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1066 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1067 prec = -2;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1068 args++;
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	1069 buf << s[i++];
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1070 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1071 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1072 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1073 if (isdigit (s[i]))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1074 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1075 int nn = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1076 std::string tmp = s.substr (i);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1077 sscanf (tmp.c_str (), "%d%n", &prec, &nn);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1078 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1079
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1080 while (i < n && isdigit (s[i]))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1081 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1082 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1083 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1084 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1085
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1086 if (i < n)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1087 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1088 // Accept and record modifier, but don't place it in the format
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1089 // item text. All integer conversions are handled as 64-bit
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1090 // integers.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1091
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1092 switch (s[i])
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1093 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1094 case 'h': case 'l': case 'L':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1095 modifier = s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1096 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1097
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1098 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1099 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1100 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1101 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1102
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1103 if (i < n)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1104 finish_conversion (s, i, args, flags, fw, prec, modifier, type);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1105 else
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1106 nconv = -1;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1107 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1108
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1109 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1110 printf_format_list::finish_conversion (const std::string& s, size_t& i,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1111 int args, const std::string& flags,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1112 int fw, int prec, char modifier,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1113 char& type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1114 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1115 switch (s[i])
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1116 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1117 case 'd': case 'i': case 'o': case 'x': case 'X':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1118 case 'u': case 'c':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1119 if (modifier == 'L')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1120 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1121 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1122 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1123 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1124 goto fini;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1125
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1126 case 'f': case 'e': case 'E': case 'g': case 'G':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1127 if (modifier == 'h' \|\| modifier == 'l')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1128 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1129 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1130 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1131 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1132 goto fini;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1133
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1134 case 's': case 'p': case '%':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1135 if (modifier != '\0')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1136 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1137 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1138 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1139 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1140 goto fini;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1141
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1142 fini:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1143
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1144 type = s[i];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1145
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1146 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1147
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1148 if (type != '%' \|\| args != 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1149 nconv++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1150
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1151 if (type != '%')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1152 args++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1153
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1154 add_elt_to_list (args, flags, fw, prec, type, modifier);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1155
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1156 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1157
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1158 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1159 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1160 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1161 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1162 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1163
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1164 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1165 printf_format_list::printme (void) const
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1166 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1167 size_t n = fmt_elts.size ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1168
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1169 for (size_t i = 0; i < n; i++)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1170 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1171 printf_format_elt *elt = fmt_elts[i];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1172
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1173 std::cerr
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1174 << "args: " << elt->args << "\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1175 << "flags: '" << elt->flags << "'\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1176 << "width: " << elt->fw << "\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1177 << "prec: " << elt->prec << "\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1178 << "type: '" << elt->type << "'\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1179 << "modifier: '" << elt->modifier << "'\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1180 << "text: '" << undo_string_escapes (elt->text) << "'\n\n";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1181 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1182 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1183 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1184
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	1185 // 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	1186 // 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	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 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	1189 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	1190 {
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	1191 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	1192
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 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	1194 {
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	1195 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	1196 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	1197 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	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
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 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	1201 }
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	1202
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1203 static Cell
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1204 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	1205 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1206 Cell retval (dim_vector (1, 2));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1207
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1208 retval(0) = Cell (octave_value ("inf"));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1209 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	1210
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	1211 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	1212 }
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	1213
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1214 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	1215 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1216 // 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	1217 // by single-character delimiters.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1218 //
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1219 // 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	1220 // 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	1221 // textscan workload.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1222 //
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1223 // 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	1224 // 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	1225 // 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	1226 // 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	1227 // 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	1228
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1229 class
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1230 delimited_stream
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1231 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1232 public:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1233
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1234 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	1235 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	1236
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1237 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	1238
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1239 // No copying!
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1240
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1241 delimited_stream (const delimited_stream&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1242
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1243 delimited_stream& operator = (const delimited_stream&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1244
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1245 ~delimited_stream (void);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1246
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1247 // 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	1248 // 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	1249 void field_done (void)
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 if (idx >= last)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1252 refresh_buf ();
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1255 // 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	1256 // 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	1257 int refresh_buf (void);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1258
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1259 // 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	1260 // a delimiter has been reached.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1261 int get (void)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1262 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1263 if (delimited)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1264 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	1265 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1266 return get_undelim ();
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1269 // 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	1270 int get_undelim (void);
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 // 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	1273 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	1274
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1275 // 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	1276 int peek_undelim (void);
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 // 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	1279 // 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	1280 // 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	1281 // 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	1282 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	1283
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1284 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	1285
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1286 // int skipline (char delim);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1287
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	1288 char * read (char buffer, int size, char &new_start);
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1289
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1290 // 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	1291 // block between calls to field_done.
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	1292 char * tellg (void) { return idx; }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1293
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1294 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	1295
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1296 bool eof (void)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1297 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1298 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	1299 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1300
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23792 diff changeset	1301 operator const void* (void) { return (! eof () && ! flags) ? this : nullptr; }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1302
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1303 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	1304
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1305 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	1306
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1307 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	1308
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1309 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	1310 = (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	1311 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1312 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	1313 }
22326 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 // 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	1316 // (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	1317
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1318 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	1319
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1320 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	1321
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1322 private:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1323
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1324 // 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	1325 int bufsize;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1326
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1327 // Stream to read from.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1328 std::istream& i_stream;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1329
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1330 // 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	1331 char *buf;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1332
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1333 // Current read pointer.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1334 char *idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1335
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1336 // 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	1337 // delimited is false).
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1338 char *last;
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 // Position after last character in buffer.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1341 char *eob;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1342
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1343 // 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	1344 bool delimited;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1345
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1346 // Longest lookahead required.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1347 int longest;
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 // Sequence of single-character delimiters.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1350 const std::string delims;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1351
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1352 // 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	1353 std::streampos buf_in_file;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1354
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1355 // 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	1356 char *progress_marker;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1357
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1358 std::ios_base::iostate flags;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1359 };
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 // 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	1362 // 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	1363 // 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	1364
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1365 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	1366 const std::string& delimiters,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1367 int longest_lookahead,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1368 octave_idx_type bsize)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1369 : 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	1370 delims (delimiters),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1371 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	1372 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1373 buf = new char[bufsize];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1374 eob = buf + bufsize;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1375 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	1376 progress_marker = idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1377 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	1378 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1379
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1380 // 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	1381 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	1382 const delimited_stream& ds)
24177 89167cc74260 Reuse constructor code of delimited stream. Daniel J Sebald <daniel.sebald@ieee.org> parents: 24176 diff changeset	1383 : delimited_stream (is, ds.delims, ds.longest, ds.bufsize)
89167cc74260 Reuse constructor code of delimited stream. Daniel J Sebald <daniel.sebald@ieee.org> parents: 24176 diff changeset	1384 {}
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1385
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1386 delimited_stream::~delimited_stream (void)
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 // 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	1389 if (! eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1390 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1391 i_stream.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1392 i_stream.seekg (buf_in_file);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1393 i_stream.read (buf, idx - 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 delete [] buf;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1397 }
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 // 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	1400 // if necessary.
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1403 delimited_stream::get_undelim (void)
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 int retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1406 if (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 setstate (std::ios_base::failbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1409 return std::istream::traits_type::eof ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1410 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1411
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1412 if (idx < eob)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1413 retval = *idx++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1414 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1415 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1416 refresh_buf ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1417
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1418 if (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 setstate (std::ios_base::eofbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1421 retval = std::istream::traits_type::eof ();
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 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1424 retval = *idx++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1425 }
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 if (idx >= last)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1428 delimited = false;
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 retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1431 }
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 // 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	1434 // 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	1435
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1436 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1437 delimited_stream::peek_undelim (void)
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 int retval = get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1440 putback ();
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 return retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1443 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1444
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1445 // 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	1446 // 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	1447 // 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	1448 // processed.
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 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1451 delimited_stream::refresh_buf (void)
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 if (eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1454 return std::istream::traits_type::eof ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1455
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1456 int retval;
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 if (eob < idx)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1459 idx = eob;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1460
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1461 size_t old_remaining = eob - idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1462
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1463 octave_quit (); // allow ctrl-C
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1464
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1465 if (old_remaining > 0)
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 buf_in_file += (idx - buf);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1468 memmove (buf, idx, old_remaining);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1469 }
24175 fadab2fc567f Properly restore the input stream pointer at end of textscan (bug #52116 et al.) Daniel J Sebald <daniel.sebald@ieee.org> parents: 23219 diff changeset	1470 else
fadab2fc567f Properly restore the input stream pointer at end of textscan (bug #52116 et al.) Daniel J Sebald <daniel.sebald@ieee.org> parents: 23219 diff changeset	1471 buf_in_file = i_stream.tellg (); // record for destructor
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1472
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1473 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	1474 idx = buf;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1475
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1476 int gcount; // chars read
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1477 if (! i_stream.eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1478 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1479 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	1480 gcount = i_stream.gcount ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1481 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1482 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1483 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 eob = buf + old_remaining + gcount;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1486 last = eob;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1487 if (gcount == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1488 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1489 delimited = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1490
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1491 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	1492 retval = 0;
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 // file and buffer are both done.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1495 retval = std::istream::traits_type::eof ();
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 else
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 delimited = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1500
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1501 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	1502 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1503 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	1504 break;
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1507 if (last < buf)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1508 delimited = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1509
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1510 retval = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1511 }
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 // 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	1514 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	1515 *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	1516
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1517 return retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1518 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1519
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1520 // 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	1521 // 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	1522 // 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	1523 // 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	1524 // 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	1525
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1526 char *
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1527 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	1528 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1529 char *retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1530
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1531 if (eob - idx > size)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1532 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1533 retval = idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1534 idx += size;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1535 if (idx > last)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1536 delimited = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1537 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1538 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1539 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1540 // 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	1541 // 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	1542 // 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	1543 // 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	1544
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1545 if (eob - prior_tell + size < bufsize)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1546 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1547 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	1548 idx = prior_tell;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1549 refresh_buf ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1550 idx += gap;
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 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	1553 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1554 refresh_buf ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1555 }
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 prior_tell = buf;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1558
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1559 if (eob - idx > size)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1560 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1561 retval = idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1562 idx += size;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1563 if (idx > last)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1564 delimited = false;
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 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1567 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1568 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	1569 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1570 retval = idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1571 memset (eob, 0, size + (idx - buf));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1572 idx += size;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1573 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1574 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	1575 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1576 retval = buffer;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1577 // FIXME: read bufsize at a time
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1578 int i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1579 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	1580 *buffer++ = get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1581 if (eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1582 memset (buffer, 0, size - i);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1583 }
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1587 return retval;
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1590 // 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	1591 // must have length at least 1.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1592
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1593 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1594 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	1595 {
23812 057a894914df Use C++11 string fcns back() and pop_back() to simplify code. Rik <rik@octave.org> parents: 23807 diff changeset	1596 int len = out.length ();
057a894914df Use C++11 string fcns back() and pop_back() to simplify code. Rik <rik@octave.org> parents: 23807 diff changeset	1597 int used = 0;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1598 int ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1599 while ((ch = get_undelim ()) != delim
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1600 && ch != std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1601 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1602 out[used++] = ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1603 if (used == len)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1604 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1605 len <<= 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1606 out.resize (len);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1607 }
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 out.resize (used);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1610 field_done ();
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 return ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1613 }
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 // 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	1616
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1617 class
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1618 textscan_format_elt
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1619 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1620 public:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1621
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1622 enum special_conversion
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1623 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1624 whitespace_conversion = 1,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1625 literal_conversion = 2
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1626 };
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1627
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1628 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	1629 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	1630 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	1631 : 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	1632 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	1633 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	1634 { }
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 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	1637 : 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	1638 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	1639 discard (e.discard), numeric (e.numeric)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1640 { }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1641
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1642 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	1643 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1644 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	1645 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1646 text = e.text;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1647 width = e.width;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1648 prec = e.prec;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1649 bitwidth = e.bitwidth;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1650 discard = e.discard;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1651 type = e.type;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1652 numeric = e.numeric;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1653 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	1654 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1655
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1656 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	1657 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1658
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1659 // The C-style format string.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1660 std::string text;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1661
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1662 // The maximum field width.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1663 unsigned int width;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1664
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1665 // 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	1666 // floating point conversion.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1667 int prec;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1668
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1669 // 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	1670 // 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	1671 int bitwidth;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1672
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1673 // 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	1674 std::string char_class;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1675
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1676 // Type of conversion
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1677 // -- `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	1678 char type;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1679
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1680 // 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	1681 bool discard;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1682
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1683 // 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	1684 bool numeric;
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1687 // The (parsed) sequence of format specifiers.
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 class textscan;
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 class
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1692 textscan_format_list
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 public:
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 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	1697 const std::string& who = "textscan");
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1698 // No copying!
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1699
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1700 textscan_format_list (const textscan_format_list&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1701
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1702 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	1703
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1704 ~textscan_format_list (void);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1705
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1706 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	1707
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1708 // 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	1709 // 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	1710 // 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	1711 // last conversion.
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 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	1714
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	1715 const textscan_format_elt * first (void)
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1716 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1717 curr_idx = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1718 return current ();
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
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	1721 const textscan_format_elt * current (void) const
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1722 {
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23792 diff changeset	1723 return numel () > 0 ? fmt_elts[curr_idx] : nullptr;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1724 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1725
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	1726 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	1727 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1728 curr_idx++;
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 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	1731 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1732 if (cycle)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1733 curr_idx = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1734 else
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23792 diff changeset	1735 return nullptr;
22326 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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1738 return current ();
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1741 void printme (void) const;
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 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	1744
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23792 diff changeset	1745 operator const void* (void) const { return ok () ? this : nullptr; }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1746
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1747 // 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	1748 std::string who;
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 // 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	1751 bool set_from_first;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1752
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1753 // 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	1754 bool has_string;
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 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	1757
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1758 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	1759
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1760 private:
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 // 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	1763 // invalid conversions have been found.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1764 octave_idx_type nconv;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1765
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1766 // Index to current element;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1767 size_t curr_idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1768
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1769 // List of format elements.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1770 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	1771
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1772 // 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	1773 std::list<octave_value> output_container;
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 // Temporary buffer.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1776 std::ostringstream buf;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1777
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1778 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	1779 octave_value val_type, bool discard,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1780 char type,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1781 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	1782
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1783 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	1784
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1785 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	1786
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1787 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	1788 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	1789 octave_value& val_type,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1790 bool discard, char& type);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1791 };
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 // 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	1794 // according to a format.
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 // The calling sequence is
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1797 //
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1798 // textscan scanner ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1799 // scanner.scan (...);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1800
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1801 class
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1802 OCTINTERP_API
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1803 textscan
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1804 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1805 public:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1806
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1807 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	1808
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1809 // No copying!
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1810
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1811 textscan (const textscan&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1812
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1813 textscan& operator = (const textscan&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1814
22868 87e3163f6c87 use c++11 "= default" syntax for declaration of trivial destructors John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	1815 ~textscan (void) = default;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1816
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1817 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	1818 octave_idx_type ntimes,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1819 const octave_value_list& options,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1820 octave_idx_type& read_count);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1821
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1822 private:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1823
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1824 friend class textscan_format_list;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1825
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1826 // 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	1827 std::string who;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1828
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1829 std::string buf;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1830
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1831 // 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	1832 // 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	1833 // 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	1834 // 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	1835
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1836 std::string whitespace_table;
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 // 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	1839 std::string delim_table;
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 // String of delimiter characters.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1842 std::string delims;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1843
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1844 Cell comment_style;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1845
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1846 // 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	1847 int comment_len;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1848
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1849 // First character of open comment.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1850 int comment_char;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1851
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1852 octave_idx_type buffer_size;
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 std::string date_locale;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1855
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1856 // 'inf' and 'nan' for formatted_double.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1857 Cell inf_nan;
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 // Array of strings of delimiters.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1860 Cell delim_list;
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 // Longest delimiter.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1863 int delim_len;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1864
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1865 octave_value empty_value;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1866 std::string exp_chars;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1867 int header_lines;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1868 Cell treat_as_empty;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1869
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1870 // 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	1871 int treat_as_empty_len;
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 std::string whitespace;
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 short eol1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1876 short eol2;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1877 short return_on_error;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1878
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1879 bool collect_output;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1880 bool multiple_delims_as_one;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1881 bool default_exp;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1882
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1883 octave_idx_type lines;
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 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	1886 octave_idx_type ntimes);
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 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	1889 textscan_format_list& fmt_list);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1890
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1891 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	1892 std::list<octave_value>& retval,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1893 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	1894
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1895 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	1896 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	1897
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1898 // 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	1899 double read_double (delimited_stream& is,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1900 const textscan_format_elt& fmt) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1901
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1902 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	1903 Complex& val) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1904
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1905 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	1906 std::string& val) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1907
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1908 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	1909 std::string& val) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1910
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1911 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	1912 std::string& val) 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 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	1915 std::string& val) 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 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	1918 std::string& val);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1919
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1920 // Helper methods.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1921 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	1922 const std::string& ends) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1923
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1924 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	1925 bool case_sensitive = true) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1926
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1927 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	1928
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1929 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	1930
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1931 int skip_delim (delimited_stream& is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1932
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1933 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	1934 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1935 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	1936 \|\| delim_table[ch] != '\0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1937 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1938
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1939 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	1940
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1941 // 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	1942 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	1943 };
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1944
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1945 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	1946 const std::string& who_arg)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1947 : 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	1948 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	1949 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1950 size_t n = s.length ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1951
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1952 size_t i = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1953
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1954 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	1955 int prec = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1956 int bitwidth = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1957 bool discard = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1958 char type = '\0';
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 bool have_more = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1961
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1962 if (s.empty ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1963 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1964 buf.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1965 buf.str ("");
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1966
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1967 buf << "%f";
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1968
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1969 bitwidth = 64;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1970 type = 'f';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1971 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	1972 discard, type);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1973 have_more = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1974 set_from_first = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1975 nconv = 1;
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 else
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 set_from_first = false;
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 while (i < n)
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 have_more = true;
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 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	1986 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1987 // Process percent-escape conversion type.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1988
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1989 process_conversion (s, i, n);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1990
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1991 // 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	1992 // 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	1993 // 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	1994 // 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	1995 // loop.
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 have_more = (buf.tellp () != 0);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1998 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1999 else if (isspace (s[i]))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2000 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2001 while (++i < n && isspace (s[i]))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2002 /* skip whitespace */;
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 have_more = false;
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 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2007 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2008 type = textscan_format_elt::literal_conversion;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2009
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2010 width = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2011 prec = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2012 bitwidth = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2013 discard = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2014
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2015 while (i < n && ! isspace (s[i])
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2016 && (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	2017 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2018 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	2019 i++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2020 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2021 width++;
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2024 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	2025 discard, type);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2026
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2027 have_more = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2028 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2029
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2030 if (nconv < 0)
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 have_more = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2033 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2034 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2035 }
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2038 if (have_more)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2039 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	2040
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2041 buf.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2042 buf.str ("");
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2043 }
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 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	2046 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2047 size_t n = numel ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2048
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2049 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	2050 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2051 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	2052 delete elt;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2053 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2054 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2055
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2056 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2057 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	2058 int bitwidth, octave_value val_type,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2059 bool discard, char type,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2060 const std::string& char_class)
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 std::string text = buf.str ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2063
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2064 if (! text.empty ())
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 textscan_format_elt *elt
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	2067 = 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	2068 char_class);
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2069
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2070 if (! discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2071 output_container.push_back (val_type);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2072
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2073 fmt_elts.push_back (elt);
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 buf.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2077 buf.str ("");
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2078 }
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 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2081 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	2082 size_t n)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2083 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2084 unsigned width = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2085 int prec = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2086 int bitwidth = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2087 bool discard = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2088 octave_value val_type;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2089 char type = '\0';
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 buf << s[i++];
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 bool have_width = false;
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 while (i < n)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2096 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2097 switch (s[i])
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2098 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2099 case '*':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2100 if (discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2101 nconv = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2102 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2103 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2104 discard = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2105 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2106 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2107 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2108
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2109 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	2110 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	2111 if (have_width)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2112 nconv = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2113 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2114 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2115 char c = s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2116 width = width * 10 + c - '0';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2117 have_width = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2118 buf << c;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2119 while (i < n && isdigit (s[i]))
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 c = s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2122 width = width * 10 + c - '0';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2123 buf << c;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2124 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2125
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2126 if (i < n && 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 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2129 prec = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2130 while (i < n && isdigit (s[i]))
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 c = s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2133 prec = prec * 10 + c - '0';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2134 buf << c;
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 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2137 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2138 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2139
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2140 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	2141 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2142 bool done = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2143 buf << (type = s[i++]);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2144 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	2145 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2146 if (s[i] == '8')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2147 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2148 bitwidth = 8;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2149 if (type == 'd')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2150 val_type = octave_value (int8NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2151 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2152 val_type = octave_value (uint8NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2153 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2154 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2155 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	2156 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2157 bitwidth = 16;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2158 if (type == 'd')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2159 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	2160 else
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2161 val_type = octave_value (uint16NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2162 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2163 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2164 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2165 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	2166 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2167 done = false; // use default size below
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2168 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2169 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	2170 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2171 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	2172 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2173 bitwidth = 64;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2174 if (type == 'd')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2175 val_type = octave_value (int64NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2176 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2177 val_type = octave_value (uint64NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2178 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2179 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2180 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2181 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2182 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	2183 }
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 else
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2185 done = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2186
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2187 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	2188 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2189 bitwidth = 32;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2190 if (type == 'd')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2191 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	2192 else
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2193 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	2194 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2195 goto fini;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2196 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2197
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2198 case 'f':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2199 buf << (type = s[i++]);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2200 bitwidth = 64;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2201 if (i < n)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2202 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2203 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	2204 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2205 bitwidth = 32;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2206 val_type = octave_value (FloatNDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2207 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2208 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2209 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2210 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	2211 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2212 val_type = octave_value (NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2213 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2214 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2215 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2216 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2217 val_type = octave_value (NDArray ());
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 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2220 val_type = octave_value (NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2221 goto fini;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2222
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2223 case 'n':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2224 buf << (type = s[i++]);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2225 bitwidth = 64;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2226 val_type = octave_value (NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2227 goto fini;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2228
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2229 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	2230 if (! discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2231 val_type = octave_value (Cell ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2232 buf << (type = s[i++]);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2233 has_string = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2234 goto fini;
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 fini:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2237 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2238 if (! have_width)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2239 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2240 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	2241 width = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2242 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2243 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	2244 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2245
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2246 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	2247 discard, type) == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2248 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	2249 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2250 break;
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 default:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2253 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	2254 who.c_str (), s[i]);
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 if (nconv < 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2258 break;
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2261 nconv = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2262 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2263
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2264 // Parse [...] and [^...]
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2265 //
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2266 // 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	2267 // 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	2268 // 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	2269 // 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	2270 // pattern.
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 // 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	2273 // 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	2274 // The latter is efficient for [^...] patterns.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2275
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2276 std::string
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2277 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	2278 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2279 int len = pattern.length ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2280 if (len == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2281 return "";
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2282
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2283 std::string retval (256, '\0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2284 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	2285
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2286 int in = 0, out = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2287 unsigned char ch, prev = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2288 bool flip = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2289
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2290 ch = pattern[in];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2291 if (ch == '^')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2292 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2293 in++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2294 flip = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2295 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2296 mask[pattern[in]] = '\1';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2297 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	2298
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2299 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	2300 bool prev_prev_was_range = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2301 for (; in < len; in++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2302 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2303 bool was_range = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2304 ch = pattern[in];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2305 if (ch == ']')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2306 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2307
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2308 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	2309 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2310 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	2311 if (start_of_range < ch
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2312 && ((isupper (ch) && isupper (start_of_range))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2313 \|\| (islower (ch) && islower (start_of_range))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2314 \|\| (isdigit (ch) && isdigit (start_of_range))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2315 \|\| 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	2316 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2317 was_range = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2318 out--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2319 mask['-']--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2320 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	2321 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2322 if (mask[i] == '\0')
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 mask[i] = '\1';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2325 retval[out++] = i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2326 }
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 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2329 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2330 if (! was_range)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2331 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2332 if (mask[ch]++ == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2333 retval[out++] = ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2334 else if (ch != '-')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2335 warning_with_id ("octave:textscan-pattern",
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2336 "%s: [...] contains two '%c's",
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2337 who.c_str (), ch);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2338
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2339 if (prev == '-' && mask['-'] >= 2)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2340 warning_with_id
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2341 ("octave:textscan-pattern",
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2342 "%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	2343 who.c_str ());
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 prev = ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2346 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	2347 prev_was_range = was_range;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2348 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2349
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2350 if (flip) // [^...]
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2351 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2352 out = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2353 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	2354 if (! mask[i])
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2355 retval[out++] = i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2356 }
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 retval.resize (out);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2359
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2360 return retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2361 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2362
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2363 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2364 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	2365 size_t n, unsigned int& width,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2366 int& prec, int& bitwidth,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2367 octave_value& val_type, bool discard,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2368 char& type)
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 int retval = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2371
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2372 std::string char_class;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2373
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2374 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	2375 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	2376
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2377 if (type != '%')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2378 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2379 nconv++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2380 if (type == '[')
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 (i < n)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2383 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2384 beg_idx = i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2385
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2386 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	2387 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2388 type = '^';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2389 buf << s[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 (i < n)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2392 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2393 beg_idx = i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2394
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2395 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 }
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	2398 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2399 else if (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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2403 while (i < n && s[i] != ']')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2404 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2405
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2406 if (i < n && s[i] == ']')
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 end_idx = i-1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2409 buf << s[i++];
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 if (s[i-1] != ']')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2413 retval = nconv = -1;
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 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2416
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2417 if (nconv >= 0)
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 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	2420 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	2421 end_idx - beg_idx + 1));
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 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	2424 char_class);
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2427 return retval;
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2430 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2431 textscan_format_list::printme (void) const
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 size_t n = numel ();
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 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	2436 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2437 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	2438
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2439 std::cerr
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2440 << "width: " << elt->width << "\n"
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2441 << "digits " << elt->prec << "\n"
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2442 << "bitwidth: " << elt->bitwidth << "\n"
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2443 << "discard: " << elt->discard << "\n"
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2444 << "type: ";
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2445
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2446 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	2447 std::cerr << "literal text\n";
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2448 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	2449 std::cerr << "whitespace\n";
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2450 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2451 std::cerr << elt->type << "\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 std::cerr
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2454 << "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	2455 << "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	2456 }
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2459 // 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	2460 // 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	2461
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2462 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2463 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	2464 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2465 // 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	2466 std::string first_line (20, ' ');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2467
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2468 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	2469
23812 057a894914df Use C++11 string fcns back() and pop_back() to simplify code. Rik <rik@octave.org> parents: 23807 diff changeset	2470 if (! first_line.empty () && first_line.back () == ts.eol1)
057a894914df Use C++11 string fcns back() and pop_back() to simplify code. Rik <rik@octave.org> parents: 23807 diff changeset	2471 first_line.pop_back ();
22326 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 std::istringstream strstr (first_line);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2474 delimited_stream ds (strstr, is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2475
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2476 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	2477 Complex val;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2478 octave_value val_type;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2479 nconv = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2480 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	2481 int retval = 0;
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 // 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	2484 while (! ds.eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2485 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2486 bool already_skipped_delim = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2487 ts.skip_whitespace (ds);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2488 ds.progress_benchmark ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2489 bool progress = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2490 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	2491 if (ds.fail ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2492 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2493 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	2494
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2495 if (ds.eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2496 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2497
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2498 // 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	2499 // return with an error status.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2500 ts.skip_delim (ds);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2501 if (ds.no_progress ())
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 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	2504 break;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2505 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2506 already_skipped_delim = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2507
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2508 val = ts.empty_value.scalar_value ();
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 if (! --max_empty)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2511 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2512 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2513
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2514 if (val.imag () == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2515 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	2516 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2517 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	2518
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2519 output_container.push_back (val_type);
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 (! already_skipped_delim)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2522 ts.skip_delim (ds);
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 if (! progress && ds.no_progress ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2525 break;
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 nconv++;
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2530 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	2531
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2532 // 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	2533 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	2534 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	2535
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2536 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	2537 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2538
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2539 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	2540 : 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	2541 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	2542 buffer_size (0), date_locale (), inf_nan (init_inf_nan ()),
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	2543 empty_value (numeric_limits<double>::NaN ()), exp_chars ("edED"),
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2544 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	2545 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	2546 return_on_error (1), collect_output (false),
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	2547 multiple_delims_as_one (false), default_exp (true), lines (0)
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2548 { }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2549
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2550 octave_value
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2551 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	2552 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	2553 octave_idx_type& count)
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 textscan_format_list fmt_list (fmt);
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 parse_options (options, fmt_list);
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 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	2560
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2561 // 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	2562 // 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	2563 // 32-bit indexing.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2564
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2565 std::ios::iostate state = isp.rdstate ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2566 isp.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2567 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	2568 isp.setstate (state);
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 return result;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2571 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2572
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2573 octave_value
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2574 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	2575 octave_idx_type ntimes)
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 octave_value retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2578
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2579 if (fmt_list.num_conversions () == -1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2580 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	2581
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2582 if (fmt_list.num_conversions () == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2583 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	2584
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2585 // skip the first header_lines
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2586 std::string dummy;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2587 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	2588 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	2589
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2590 // 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	2591
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2592 // 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	2593 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	2594 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	2595
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2596 // 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	2597 octave_idx_type buf_size = 4096;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2598 if (buffer_size)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2599 buf_size = buffer_size;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2600 else if (ntimes > 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2601 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2602 // Avoid overflow of 80*ntimes...
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2603 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	2604 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	2605 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2606 // Finally, create the stream.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2607 delimited_stream is (isp,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2608 (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	2609 max_lookahead, buf_size);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2610
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2611 // 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	2612 // (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	2613 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	2614 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	2615 row_idx(1) = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2616
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2617 int err = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2618 octave_idx_type row = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2619
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2620 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	2621 skip_delim (is);
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 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	2624
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2625 // 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	2626 if (fmt_list.set_from_first)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2627 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2628 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	2629 lines = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2630
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2631 done_after = fmt_list.numel () + 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2632 if (! err)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2633 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	2634 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2635 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2636 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	2637
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2638 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	2639
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2640 // 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	2641 // Check now which columns to merge.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2642 // 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	2643 // after reading in data.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2644 // 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	2645 // 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	2646 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	2647 int conv = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2648 if (collect_output)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2649 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2650 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	2651 for (const auto& col : out)
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2652 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2653 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	2654 \|\| (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	2655 merge_with_prev[conv++] = true;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2656 else
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2657 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	2658
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2659 prev_type = col.type_id ();
22326 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 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2662
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2663 // 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	2664 // infinite loop below.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2665 if (fmt_list.num_conversions () == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2666 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	2667
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2668 // 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	2669 if (! err)
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 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	2672 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2673 if (row == 0 \|\| row >= size)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2674 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2675 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	2676 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	2677 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	2678 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2679
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2680 row_idx(0) = row;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2681 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	2682
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2683 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	2684 break;
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 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2687
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2688 if ((err & 4) && ! return_on_error)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2689 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	2690 done_after + 1, row + 1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2691
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2692 // 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	2693 bool uneven_columns = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2694 if (err & 4)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2695 uneven_columns = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2696 else if (isp.eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2697 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2698 isp.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2699 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	2700 int last_char = isp.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2701 isp.setstate (isp.eofbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2702 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	2703 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2704
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2705 // convert return value to Cell array
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2706 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	2707
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2708 // (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	2709 // 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	2710 if (err & 1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2711 done_after = out.size () + 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2712
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	2713 int valid_rows = (row == ntimes
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	2714 ? ntimes
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	2715 : ((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	2716 dim_vector dv (valid_rows, 1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2717
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2718 ra_idx(0) = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2719 int i = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2720 if (! collect_output)
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 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	2723 for (auto& col : out)
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2724 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2725 // 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	2726 if (i == done_after && uneven_columns)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2727 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	2728
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2729 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	2730 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	2731 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	2732 i++;
22326 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 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2735 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	2736 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2737 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	2738 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	2739 int prev_type = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2740
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2741 conv = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2742 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	2743 for (auto& col : out)
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2744 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2745 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	2746 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2747 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	2748 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2749 ra_idx(1) = i++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2750 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	2751 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	2752 }
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2753 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	2754 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	2755 prev_type = col.type_id ();
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2756 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2757 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2758 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2759 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	2760 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	2761 ra_idx);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2762 }
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 ra_idx(1) = i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2765 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	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 return retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2769 }
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 // 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	2772 // EXP_CHARS option of OPTIONS.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2773
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2774 double
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2775 textscan::read_double (delimited_stream& is,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2776 const textscan_format_elt& fmt) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2777 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2778 int sign = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2779 unsigned int width_left = fmt.width;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2780 double retval = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2781 bool valid = false; // syntactically correct double?
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2782
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2783 int ch = is.peek ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2784
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2785 if (ch == '+')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2786 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2787 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2788 ch = is.peek ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2789 if (width_left)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2790 width_left--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2791 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2792 else if (ch == '-')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2793 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2794 sign = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2795 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2796 ch = is.peek ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2797 if (width_left)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2798 width_left--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2799 }
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 // Read integer part
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2802 if (ch != '.')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2803 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2804 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	2805 valid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2806 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	2807 retval = retval * 10 + (ch - '0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2808 width_left++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2809 }
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 // 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	2812 if (ch == '.' && width_left)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2813 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2814 double multiplier = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2815 int precision = fmt.prec;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2816 int i;
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 (width_left)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2819 width_left--; // Consider width of '.'
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 (precision == -1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2822 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	2823
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2824 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	2825 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	2826
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2827 for (i = 0; i < precision; i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2828 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2829 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	2830 retval += (ch - '0') * (multiplier *= 0.1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2831 else
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 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	2834 break;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2835 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2836 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2837
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2838 // 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	2839 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	2840 && ch <= '9')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2841 retval += multiplier;
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 if (i > 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2844 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	2845
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2846 // 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	2847 if (i == precision)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2848 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	2849 ; // discard
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 width_left++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2852 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2853
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2854 // 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	2855 bool used_exp = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2856 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	2857 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2858 int ch1 = is.peek ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2859 if (ch1 == '-' \|\| ch1 == '+' \|\| (ch1 >= '0' && ch1 <= '9'))
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	2860 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	2861 // 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	2862 width_left--; // count "E"
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2863 int exp = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2864 int exp_sign = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2865 if (ch1 == '+')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2866 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2867 if (width_left)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2868 width_left--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2869 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2870 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2871 else if (ch1 == '-')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2872 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2873 exp_sign = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2874 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2875 if (width_left)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2876 width_left--;
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 valid = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2879 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	2880 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2881 exp = exp*10 + ch - '0';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2882 valid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2883 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2884 width_left++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2885 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	2886 is.putback (ch);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2887
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2888 double multiplier = pown (10, exp);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2889 if (exp_sign > 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2890 retval *= multiplier;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2891 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2892 retval /= multiplier;
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 used_exp = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2895 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2896 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2897 is.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2898 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	2899 is.putback (ch);
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 // Check for +/- inf and NaN
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2902 if (! valid && width_left >= 3)
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 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	2905 if (i == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2906 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	2907 retval = numeric_limits<double>::Inf ();
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2908 valid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2909 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2910 else if (i == 1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2911 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	2912 retval = numeric_limits<double>::NaN ();
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2913 valid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2914 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2915 }
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 // Check for +/- inf and NaN
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2918 if (! valid && width_left >= 3)
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 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	2921 if (i == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2922 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	2923 retval = numeric_limits<double>::Inf ();
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2924 valid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2925 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2926 else if (i == 1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2927 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	2928 retval = numeric_limits<double>::NaN ();
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2929 valid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2930 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2931 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2932
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2933 if (! valid)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2934 is.setstate (std::ios::failbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2935 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2936 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	2937
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2938 return retval * sign;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2939 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2940
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2941 // 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	2942 // 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	2943 // 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	2944
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2945 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2946 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	2947 Complex& val) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2948 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2949 double im = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2950 double re = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2951 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	2952 bool inf = false;
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 int ch = is.peek ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2955 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	2956 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2957 ch = is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2958 int ch2 = is.peek ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2959 if (ch2 == 'i' \|\| ch2 == 'j')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2960 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2961 double value = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2962 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2963 // Check not -inf
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2964 if (is.peek () == 'n')
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 char *pos = is.tellg ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2967 std::ios::iostate state = is.rdstate ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2968
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2969 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2970 ch2 = is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2971 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	2972 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2973 inf = true;
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	2974 re = (ch == '+' ? numeric_limits<double>::Inf ()
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	2975 : -numeric_limits<double>::Inf ());
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2976 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	2977 }
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	2978 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	2979 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2980 is.clear (state);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2981 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	2982 }
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2985 im = (ch == '+') ? value : -value;
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 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2988 is.putback (ch);
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2991 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	2992 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2993 char *pos = is.tellg ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2994 std::ios::iostate state = is.rdstate ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2995 //re = octave_read_value<double> (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2996 re = read_double (is, fmt);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2997
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2998 // check for "treat as empty" string
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2999 if (treat_as_empty.numel ()
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	3000 && (is.fail () \|\| math::is_NaN_or_NA (Complex (re))
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	3001 \|\| re == numeric_limits<double>::Inf ()))
22326 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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3004 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	3005 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3006 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	3007 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3008 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	3009 break;
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 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3012 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	3013 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3014 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	3015
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3016 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	3017 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	3018
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3019 // 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	3020 // 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	3021 // that matches.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3022 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	3023 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	3024
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3025 is.clear (state);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3026 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	3027 // 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	3028
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3029 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	3030 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3031 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	3032 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	3033 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3034 as_empty = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3035 // read just the right amount
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3036 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	3037 break;
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 }
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3043 if (! is.eof () && ! as_empty)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3044 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3045 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	3046 pos = is.tellg ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3047 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	3048 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	3049 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3050 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3051 im = re;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3052 re = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3053 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3054 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	3055 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3056 // 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	3057 pos = is.tellg ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3058 state = is.rdstate ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3059
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3060 //im = octave_read_value<double> (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3061 im = read_double (is, fmt);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3062 if (is.fail ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3063 im = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3064
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3065 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	3066 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3067 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3068 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3069 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	3070 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	3071 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	3072 }
22326 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 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	3075 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	3076 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3077 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3078 if (as_empty)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3079 val = empty_value.scalar_value ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3080 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3081 val = Complex (re, im);
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3084 // 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	3085
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3086 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3087 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	3088 std::string& val) const
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 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	3091 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	3092
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3093 while (is && ((c1 = (is && ! is.eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3094 ? is.get_undelim ()
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3095 : std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3096 != std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3097 && pattern.find (c1) == std::string::npos)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3098 obuf << static_cast<char> (c1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3099
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3100 val = obuf.str ();
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 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	3103 is.putback (c1);
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 return c1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3106 }
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 // 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	3109 // 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	3110
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3111 std::string
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3112 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	3113 const std::string& ends) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3114 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3115 std::string retval ("");
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3116 bool done = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3117 do
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3118 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3119 // 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	3120 std::string next;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3121 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	3122 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	3123
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3124 int last = (! is.eof ()
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3125 ? 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	3126
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3127 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	3128 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3129 retval = retval + static_cast<char> (last);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3130 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	3131 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3132 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	3133 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	3134 ? retval.length () - delim.length ()
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3135 : 0);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3136 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	3137 if (may_match == delim)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3138 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3139 done = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3140 retval = retval.substr (0, start);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3141 break;
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 }
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 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3146 while (! done && is && ! is.eof ());
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 return retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3149 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3150
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3151 // 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	3152 // 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	3153 // 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	3154
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3155 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3156 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	3157 std::string& val) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3158 {
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	3159 if (delim_list.isempty ())
22326 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 unsigned int i = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3162 unsigned int width = fmt.width;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3163
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3164 for (i = 0; i < width; i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3165 {
23824 061a343089be Miscellaneous cleanups of C++11 std::string code. Rik <rik@octave.org> parents: 23812 diff changeset	3166 // Grow string in an exponential fashion if necessary.
061a343089be Miscellaneous cleanups of C++11 std::string code. Rik <rik@octave.org> parents: 23812 diff changeset	3167 if (i >= val.length ())
061a343089be Miscellaneous cleanups of C++11 std::string code. Rik <rik@octave.org> parents: 23812 diff changeset	3168 val.append (std::max (val.length (),
061a343089be Miscellaneous cleanups of C++11 std::string code. Rik <rik@octave.org> parents: 23812 diff changeset	3169 static_cast<size_t> (16)), '\0');
061a343089be Miscellaneous cleanups of C++11 std::string code. Rik <rik@octave.org> parents: 23812 diff changeset	3170
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3171 int ch = is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3172 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	3173 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3174 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	3175 break;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3176 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3177 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3178 val[i] = ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3179 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3180 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	3181 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3182 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	3183 {
23824 061a343089be Miscellaneous cleanups of C++11 std::string code. Rik <rik@octave.org> parents: 23812 diff changeset	3184 std::string ends (delim_list.numel (), '\0');
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3185 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	3186 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3187 std::string tmp = delim_list(i).string_value ();
23824 061a343089be Miscellaneous cleanups of C++11 std::string code. Rik <rik@octave.org> parents: 23812 diff changeset	3188 ends[i] = tmp.back ();
22326 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 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	3191 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3192 }
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 // 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	3195
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3196 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3197 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	3198 std::string& val) const
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 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	3201 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	3202
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3203 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	3204 obuf << static_cast<char> (c1);
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 val = obuf.str ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3207 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	3208 is.putback (c1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3209 return c1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3210 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3211
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3212 // 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	3213 // 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	3214 // 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	3215
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3216 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3217 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	3218 std::string& val)
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 skip_whitespace (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3221
23803 90689bdbe048 Use C++11 raw string literals to avoid escaping double quotes. Rik <rik@octave.org> parents: 23796 diff changeset	3222 if (is.peek () != '"')
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3223 scan_string (is, fmt, val);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3224 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3225 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3226 is.get ();
23803 90689bdbe048 Use C++11 raw string literals to avoid escaping double quotes. Rik <rik@octave.org> parents: 23796 diff changeset	3227 scan_caret (is, R"(")", val); // read everything until "
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3228 is.get (); // swallow "
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3229
23803 90689bdbe048 Use C++11 raw string literals to avoid escaping double quotes. Rik <rik@octave.org> parents: 23796 diff changeset	3230 while (is && is.peek () == '"') // if double ", insert one in stream,
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3231 { // and keep looking for single "
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3232 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3233 std::string val1;
23803 90689bdbe048 Use C++11 raw string literals to avoid escaping double quotes. Rik <rik@octave.org> parents: 23796 diff changeset	3234 scan_caret (is, R"(")", val1);
90689bdbe048 Use C++11 raw string literals to avoid escaping double quotes. Rik <rik@octave.org> parents: 23796 diff changeset	3235 val = val + '"' + val1;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3236 is.get_undelim ();
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 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3239 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3240
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3241 // 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	3242 // including any whitespace or delimiters.
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 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3245 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	3246 std::string& val) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3247 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3248 val.resize (fmt.width);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3249
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3250 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	3251 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3252 int ch = is.get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3253 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	3254 val[i] = ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3255 else
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 val.resize (i);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3258 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3259 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3260 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3261 }
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 // 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	3264
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3265 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3266 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	3267 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	3268 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3269 skip_whitespace (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3270
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3271 is.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3272
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3273 octave_value val;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3274 if (fmt.numeric)
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.type == 'f' \|\| fmt.type == 'n')
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 Complex v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3279 skip_whitespace (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3280 scan_complex (is, fmt, v);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3281
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3282 if (! fmt.discard && ! is.fail ())
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 (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	3285 {
23582 0cc2011d800e maint: Deprecate is_real_type and replace with isreal. Rik <rik@octave.org> parents: 23580 diff changeset	3286 if (ov.isreal () && v.imag () == 0)
22326 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.real ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3288 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3289 {
23582 0cc2011d800e maint: Deprecate is_real_type and replace with isreal. Rik <rik@octave.org> parents: 23580 diff changeset	3290 if (ov.isreal ()) // cat does type conversion
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3291 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	3292 else
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), v);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3294 }
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	3295 }
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	3296 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	3297 {
23582 0cc2011d800e maint: Deprecate is_real_type and replace with isreal. Rik <rik@octave.org> parents: 23580 diff changeset	3298 if (ov.isreal () && v.imag () == 0)
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3299 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	3300 float (v.real ()));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3301 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3302 {
23582 0cc2011d800e maint: Deprecate is_real_type and replace with isreal. Rik <rik@octave.org> parents: 23580 diff changeset	3303 if (ov.isreal ()) // cat does type conversion
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3304 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	3305 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3306 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	3307 FloatComplex (v));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3308 }
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	3309 }
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	3310 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3311 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3312 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3313 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3314 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	3315 // 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	3316 // 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	3317 skip_whitespace (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3318 v = read_double (is, fmt);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3319 if (! fmt.discard && ! is.fail ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3320 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	3321 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3322 case 64:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3323 switch (fmt.type)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3324 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3325 case 'd':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3326 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3327 octave_int64 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3328 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	3329 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3330 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3331
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3332 case 'u':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3333 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3334 octave_uint64 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3335 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	3336 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3337 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3338 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3339 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3340
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3341 case 32:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3342 switch (fmt.type)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3343 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3344 case 'd':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3345 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3346 octave_int32 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3347 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	3348 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3349 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3350
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3351 case 'u':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3352 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3353 octave_uint32 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3354 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	3355 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3356 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3357 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3358 break;
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 case 16:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3361 if (fmt.type == 'd')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3362 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3363 octave_int16 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3364 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	3365 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3366 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3367 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3368 octave_uint16 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3369 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	3370 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3371 break;
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 case 8:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3374 if (fmt.type == 'd')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3375 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3376 octave_int8 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3377 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	3378 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3379 else
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 octave_uint8 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3382 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	3383 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3384 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3385 }
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3388 if (is.fail () & ! fmt.discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3389 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	3390 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3391 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3392 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3393 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	3394 switch (fmt.type)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3395 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3396 case 's':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3397 scan_string (is, fmt, vv);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3398 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3399
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3400 case 'q':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3401 scan_qstring (is, fmt, vv);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3402 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3403
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3404 case 'c':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3405 scan_cstring (is, fmt, vv);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3406 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3407
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3408 case '[':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3409 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	3410 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3411
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3412 case '^':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3413 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	3414 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3415 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3416
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3417 if (! fmt.discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3418 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	3419 Cell (octave_value (vv)));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3420
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3421 // 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	3422 if (! vv.empty ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3423 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	3424 }
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 is.field_done ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3427 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3428
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3429 // 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	3430 // values in row ROW of retval.
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 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3433 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	3434 textscan_format_list& fmt_list,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3435 std::list<octave_value>& retval,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3436 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	3437 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3438 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	3439 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	3440 bool no_conversions = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3441 bool done = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3442 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	3443 bool nothing_worked = true;
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 octave_quit ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3446
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3447 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	3448 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3449 bool this_conversion_failed = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3450
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3451 // Clear fail of previous numeric conversions.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3452 is.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3453
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3454 switch (elem->type)
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 'C':
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 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	3459 who.c_str (), elem->type);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3460 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3461
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3462 case 'u':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3463 case 'd':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3464 case 'f':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3465 case 'n':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3466 case 's':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3467 case '[':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3468 case '^':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3469 case 'q':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3470 case 'c':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3471 scan_one (is, elem, out, row);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3472 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3473
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3474 case textscan_format_elt::literal_conversion :
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3475 match_literal (is, *elem);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3476 break;
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 default:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3479 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	3480 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3481
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3482 if (! is.fail ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3483 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3484 if (! elem->discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3485 no_conversions = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3486 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3487 else
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 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	3490
23792 0fb64e83f8b3 * oct-stream.cc (textscan::read_format_once): Fix typo (! instead of ~). John W. Eaton <jwe@octave.org> parents: 23738 diff changeset	3491 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	3492 this_conversion_failed = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3493 }
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 if (! elem->discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3496 out++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3497
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3498 elem = fmt_list.next ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3499 char *pos = is.tellg ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3500
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3501 // 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	3502 // 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	3503 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	3504 // && elem->type != '[' && elem->type != '^' && elem->type != 'c'
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3505 )
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3506 skip_delim (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3507
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3508 if (is.eof ())
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 if (! done)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3511 done_after = i+1;
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 // 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	3514 done = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3515 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3516
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3517 if (this_conversion_failed)
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 if (is.tellg () == pos && ! conversion_failed)
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3520 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3521 // done_after = first failure
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3522 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	3523 conversion_failed = true;
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 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3526 this_conversion_failed = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3527 }
22737 7abc25e6206a maint: Clean up code base to follow Octave coding conventions. Rik <rik@octave.org> parents: 22407 diff changeset	3528 else if (! done && ! conversion_failed)
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3529 nothing_worked = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3530 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3531
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3532 if (done)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3533 is.setstate (std::ios::eofbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3534
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3535 return no_conversions
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3536 + (is.eof () ? 2 : 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3537 + (conversion_failed ? 4 : 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3538 + (nothing_worked ? 8 : 0);
22326 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 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3541
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3542 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3543 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	3544 textscan_format_list& fmt_list)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3545 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3546 int last = args.length ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3547 int n = last;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3548
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3549 if (n & 1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3550 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	3551 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	3552
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3553 delim_len = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3554 bool have_delims = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3555 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	3556 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3557 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	3558 who.c_str (),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3559 args(i).type_name ().c_str (),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3560 i/2 + 1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3561 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	3562
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3563 if (param == "delimiter")
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3564 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3565 bool invalid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3566 if (args(i+1).is_string ())
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 invalid = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3569 have_delims = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3570 delims = args(i+1).string_value ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3571 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	3572 delims = do_string_escapes (delims);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3573 }
23576 00e518162fda maint: Deprecate is_cell and replace with iscell. Rik <rik@octave.org> parents: 23534 diff changeset	3574 else if (args(i+1).iscell ())
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3575 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3576 invalid = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3577 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	3578 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	3579
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3580 // 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	3581 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	3582 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3583 if (! delim_list(j).is_string ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3584 invalid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3585 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3586 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3587 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	3588 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	3589 .string_value ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3590 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	3591 .length ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3592 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	3593 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3594 }
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 (invalid)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3597 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	3598 who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3599 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3600 else if (param == "commentstyle")
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3601 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3602 if (args(i+1).is_string ())
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3603 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3604 // 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	3605 comment_style = Cell (args(i+1));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3606 }
23576 00e518162fda maint: Deprecate is_cell and replace with iscell. Rik <rik@octave.org> parents: 23534 diff changeset	3607 else if (args(i+1).iscell ())
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3608 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3609 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	3610 int len = comment_style.numel ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3611 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	3612 \|\| (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	3613 \|\| (len >= 3))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3614 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	3615 who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3616 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3617 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3618 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	3619 who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3620
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3621 // 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	3622 // 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	3623 if (comment_style.numel () >= 1)
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 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	3626 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	3627 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3628 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3629 else if (param == "treatasempty")
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 bool invalid = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3632 if (args(i+1).is_string ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3633 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3634 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	3635 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	3636 }
23576 00e518162fda maint: Deprecate is_cell and replace with iscell. Rik <rik@octave.org> parents: 23534 diff changeset	3637 else if (args(i+1).iscell ())
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3638 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3639 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	3640 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	3641 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	3642 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	3643 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	3644 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3645 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	3646 if (k > treat_as_empty_len)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3647 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	3648 }
22326 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 if (invalid)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3651 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	3652 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 // 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	3655 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3656 else if (param == "collectoutput")
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 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	3659 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3660 else if (param == "emptyvalue")
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 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	3663 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3664 else if (param == "headerlines")
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 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	3667 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3668 else if (param == "bufsize")
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 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	3671 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3672 else if (param == "multipledelimsasone")
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 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	3675 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3676 else if (param == "returnonerror")
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 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	3679 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3680 else if (param == "whitespace")
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3681 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3682 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	3683 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3684 else if (param == "expchars")
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3685 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3686 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	3687 default_exp = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3688 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3689 else if (param == "endofline")
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3690 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3691 bool valid = true;
23804 8057d3f0673d Use C++11 raw string literals to avoid escaping backslashes in strings. Rik <rik@octave.org> parents: 23803 diff changeset	3692 std::string s = args(i+1).xstring_value (R"(%s: EndOfLine must be at most one character or '\r\n')", who.c_str ());
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3693 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	3694 s = do_string_escapes (s);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3695 int l = s.length ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3696 if (l == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3697 eol1 = eol2 = -2;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3698 else if (l == 1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3699 eol1 = eol2 = s.c_str ()[0];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3700 else if (l == 2)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3701 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3702 eol1 = s.c_str ()[0];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3703 eol2 = s.c_str ()[1];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3704 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	3705 valid = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3706 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3707 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3708 valid = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3709
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3710 if (! valid)
23804 8057d3f0673d Use C++11 raw string literals to avoid escaping backslashes in strings. Rik <rik@octave.org> parents: 23803 diff changeset	3711 error (R"(%s: EndOfLine must be at most one character or '\r\n')",
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3712 who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3713 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3714 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3715 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	3716 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3717
24303 ddc91a2ee0e0 Remove all delimiters from whitespace list in textscan function (bug #52479). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24175 diff changeset	3718 // Remove any user-supplied delimiter from whitespace list
ddc91a2ee0e0 Remove all delimiters from whitespace list in textscan function (bug #52479). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24175 diff changeset	3719 for (unsigned int j = 0; j < delims.length (); j++)
ddc91a2ee0e0 Remove all delimiters from whitespace list in textscan function (bug #52479). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24175 diff changeset	3720 {
ddc91a2ee0e0 Remove all delimiters from whitespace list in textscan function (bug #52479). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24175 diff changeset	3721 whitespace.erase (std::remove (whitespace.begin (),
ddc91a2ee0e0 Remove all delimiters from whitespace list in textscan function (bug #52479). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24175 diff changeset	3722 whitespace.end (),
ddc91a2ee0e0 Remove all delimiters from whitespace list in textscan function (bug #52479). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24175 diff changeset	3723 delims[j]),
ddc91a2ee0e0 Remove all delimiters from whitespace list in textscan function (bug #52479). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24175 diff changeset	3724 whitespace.end ());
ddc91a2ee0e0 Remove all delimiters from whitespace list in textscan function (bug #52479). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24175 diff changeset	3725 }
ddc91a2ee0e0 Remove all delimiters from whitespace list in textscan function (bug #52479). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24175 diff changeset	3726 for (int j = 0; j < delim_list.numel (); j++)
ddc91a2ee0e0 Remove all delimiters from whitespace list in textscan function (bug #52479). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24175 diff changeset	3727 {
ddc91a2ee0e0 Remove all delimiters from whitespace list in textscan function (bug #52479). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24175 diff changeset	3728 std::string delim = delim_list(j).string_value ();
ddc91a2ee0e0 Remove all delimiters from whitespace list in textscan function (bug #52479). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24175 diff changeset	3729 if (delim.length () == 1)
ddc91a2ee0e0 Remove all delimiters from whitespace list in textscan function (bug #52479). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24175 diff changeset	3730 whitespace.erase (std::remove (whitespace.begin (),
ddc91a2ee0e0 Remove all delimiters from whitespace list in textscan function (bug #52479). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24175 diff changeset	3731 whitespace.end (),
ddc91a2ee0e0 Remove all delimiters from whitespace list in textscan function (bug #52479). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24175 diff changeset	3732 delim[0]),
ddc91a2ee0e0 Remove all delimiters from whitespace list in textscan function (bug #52479). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24175 diff changeset	3733 whitespace.end ());
ddc91a2ee0e0 Remove all delimiters from whitespace list in textscan function (bug #52479). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24175 diff changeset	3734 }
ddc91a2ee0e0 Remove all delimiters from whitespace list in textscan function (bug #52479). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24175 diff changeset	3735
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3736 whitespace_table = std::string (256, '\0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3737 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	3738 whitespace_table[whitespace[i]] = '1';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3739
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3740 // 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	3741 // whitespace is explicitly ignored.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3742 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	3743 whitespace_table[' '] = '1';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3744
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3745 // 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	3746 delim_table = std::string (256, '\0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3747 if (eol1 >= 0 && eol1 < 256)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3748 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	3749 if (eol2 >= 0 && eol2 < 256)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3750 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	3751 if (! have_delims)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3752 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	3753 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3754 if (isspace (i))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3755 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	3756 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3757 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3758 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	3759 delim_table[delims[i]] = '1';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3760 }
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 // 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	3763 // 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	3764
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3765 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3766 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	3767 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3768 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	3769 bool found_comment = false;
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 do
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 found_comment = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3774 int prev = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3775 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	3776 && ( ( (c1 == eol1 \|\| c1 == eol2) && ++lines && ! EOLstop)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3777 \|\| isspace (c1)))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3778 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3779 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	3780 lines--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3781 prev = c1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3782 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3783
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3784 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	3785 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3786 // 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	3787 char *pos = is.tellg ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3788 std::ios::iostate state = is.rdstate ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3789
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3790 std::string tmp (comment_len, '\0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3791 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	3792 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	3793 .c_str (), look, comment_len-1))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3794 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3795 found_comment = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3796
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3797 std::string dummy;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3798 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	3799 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3800 std::string eol (3, '\0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3801 eol[0] = eol1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3802 eol[1] = eol2;
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 scan_caret (is, eol, dummy);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3805 c1 = is.get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3806 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	3807 is.get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3808 lines++;
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 else // matching pair
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3811 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3812 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	3813 // last char of end-comment sequence
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3814 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	3815 std::string may_match ("");
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3816 do
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3817 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3818 // 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	3819 scan_caret (is, last, dummy);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3820 is.get_undelim (); // (read LAST itself)
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 may_match = may_match + dummy + last;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3823 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	3824 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3825 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	3826 may_match = may_match.substr (start);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3827 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3828 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3829 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	3830 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3831 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3832 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	3833 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3834 is.clear (state);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3835 is.seekg (pos);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3836 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3837 }
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 while (found_comment);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3840
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3841 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	3842 is.putback (c1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3843 return c1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3844 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3845
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3846 // 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	3847 // 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	3848 // 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	3849
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3850 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3851 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	3852 bool case_sensitive) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3853 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3854 // target strings may be different sizes.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3855 // 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	3856 // that matches.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3857
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3858 char *pos = is.tellg ();
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 std::string tmp (max_len, '\0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3861 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	3862
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3863 is.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3864 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	3865 // 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	3866
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3867 int i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3868 int (compare)(const char , const char *, size_t);
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	3869 compare = (case_sensitive ? strncmp : strncasecmp);
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3870
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3871 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	3872 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3873 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	3874 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	3875 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3876 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	3877 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3878 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3879 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3880
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3881 if (i == targets.numel ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3882 i = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3883
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3884 return i;
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3887 // Skip delimiters -- multiple if MultipleDelimsAsOne specified.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3888 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3889 textscan::skip_delim (delimited_stream& is)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3890 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3891 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	3892 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	3893 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3894 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	3895 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3896 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3897 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	3898 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	3899
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3900 if (multiple_delims_as_one)
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 int prev = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3903 // skip multiple delims.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3904 // 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	3905 while (is && ((c1 = is.get_undelim ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3906 != std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3907 && (((c1 == eol1 \|\| c1 == eol2) && ++lines)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3908 \|\| isspace (c1) \|\| is_delim (c1)))
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 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	3911 lines--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3912 prev = c1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3913 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3914 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	3915 is.putback (c1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3916 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3917 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3918 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3919 else // multi-character delimiter
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3920 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3921 int first_match;
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 (c1 == eol1 \|\| c1 == eol2
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3924 \|\| (-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	3925 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3926 if (c1 == eol1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3927 {
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	3928 is.get_undelim ();
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3929 if (is.peek_undelim () == eol2)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3930 is.get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3931 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3932 else if (c1 == eol2)
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 is.get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3935 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3936
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3937 if (multiple_delims_as_one)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3938 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3939 int prev = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3940 // skip multiple delims.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3941 // 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	3942 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	3943 != std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3944 && (((c1 == eol1 \|\| c1 == eol2) && ++lines)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3945 \|\| -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	3946 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3947 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	3948 lines--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3949 prev = c1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3950 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3951 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3952 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3953 }
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 return c1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3956 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3957
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3958 // 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	3959 // 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	3960 // false (and set failbit).
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3961
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3962 bool
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3963 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	3964 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3965 // "false" -> treat EOL as normal space
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3966 // 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	3967 skip_whitespace (is, false);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3968
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3969 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	3970 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3971 int ch = is.get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3972 if (ch != fmt.text[i])
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3973 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3974 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	3975 is.putback (ch);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3976 is.setstate (std::ios::failbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3977 return false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3978 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3979 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3980 return true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3981 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3982
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3983 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3984 base_stream::error (const std::string& msg)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3985 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3986 fail = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3987 errmsg = msg;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3988 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3989
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3990 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3991 base_stream::error (const std::string& who, const std::string& msg)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3992 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3993 fail = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3994 errmsg = who + ": " + msg;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3995 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3996
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3997 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3998 base_stream::clear (void)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3999 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4000 fail = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4001 errmsg = "";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4002 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4003
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4004 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4005 base_stream::clearerr (void)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4006 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4007 std::istream *is = input_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4008 std::ostream *os = output_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4009
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4010 if (is)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4011 is->clear ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4012
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4013 if (os)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4014 os->clear ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4015 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4016
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4017 // Functions that are defined for all input streams (input streams
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4018 // are those that define is).
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4019
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4020 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4021 base_stream::do_gets (octave_idx_type max_len, bool& err,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4022 bool strip_newline, const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4023 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	4024 if (application::interactive () && file_number () == 0)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4025 ::error ("%s: unable to read from stdin while running interactively",
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4026 who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4027
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4028 std::string retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4029
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4030 err = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4031
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4032 std::istream *isp = input_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4033
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4034 if (! isp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4035 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4036 err = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4037 invalid_operation (who, "reading");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4038 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4039 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4040 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4041 std::istream& is = *isp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4042
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4043 std::ostringstream buf;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4044
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4045 int c = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4046 int char_count = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4047
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4048 if (max_len != 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4049 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4050 while (is && (c = is.get ()) != std::istream::traits_type::eof ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4051 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4052 char_count++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4053
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4054 // Handle CRLF, CR, or LF as line ending.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4055 if (c == '\r')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4056 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4057 if (! strip_newline)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4058 buf << static_cast<char> (c);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4059
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4060 c = is.get ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4061
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4062 if (c != std::istream::traits_type::eof ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4063 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4064 if (c == '\n')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4065 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4066 char_count++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4067
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4068 if (! strip_newline)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4069 buf << static_cast<char> (c);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4070 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4071 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4072 is.putback (c);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4073 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4074
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4075 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4076 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4077 else if (c == '\n')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4078 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4079 if (! strip_newline)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4080 buf << static_cast<char> (c);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4081
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4082 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4083 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4084 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4085 buf << static_cast<char> (c);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4086
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4087 if (max_len > 0 && char_count == max_len)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4088 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4089 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4090 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4091
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4092 if (! is.eof () && char_count > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4093 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4094 // GAGME. Matlab seems to check for EOF even if the last character
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4095 // in a file is a newline character. This is NOT what the
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4096 // corresponding C-library functions do.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4097 int disgusting_compatibility_hack = is.get ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4098 if (! is.eof ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4099 is.putback (disgusting_compatibility_hack);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4100 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4101
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4102 if (is.good () \|\| (is.eof () && char_count > 0))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4103 retval = buf.str ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4104 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4105 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4106 err = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4107
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4108 if (is.eof () && char_count == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4109 error (who, "at end of file");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4110 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4111 error (who, "read error");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4112 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4113 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4114
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4115 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4116 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4117
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4118 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4119 base_stream::getl (octave_idx_type max_len, bool& err,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4120 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4121 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4122 return do_gets (max_len, err, true, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4123 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4124
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4125 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4126 base_stream::gets (octave_idx_type max_len, bool& err,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4127 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4128 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4129 return do_gets (max_len, err, false, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4130 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4131
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4132 off_t
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4133 base_stream::skipl (off_t num, bool& err, const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4134 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	4135 if (application::interactive () && file_number () == 0)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4136 ::error ("%s: unable to read from stdin while running interactively",
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4137 who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4138
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4139 off_t cnt = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4140
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4141 err = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4142
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4143 std::istream *isp = input_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4144
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4145 if (! isp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4146 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4147 err = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4148 invalid_operation (who, "reading");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4149 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4150 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4151 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4152 std::istream& is = *isp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4153
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4154 int c = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4155 int lastc = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4156 cnt = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4157
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4158 while (is && (c = is.get ()) != std::istream::traits_type::eof ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4159 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4160 // Handle CRLF, CR, or LF as line ending.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4161 if (c == '\r' \|\| (c == '\n' && lastc != '\r'))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4162 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4163 if (++cnt == num)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4164 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4165 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4166
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4167 lastc = c;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4168 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4169
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4170 // Maybe eat the following \n if \r was just met.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4171 if (c == '\r' && is.peek () == '\n')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4172 is.get ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4173
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4174 if (is.bad ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4175 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4176 err = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4177 error (who, "read error");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4178 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4179
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4180 if (err)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4181 cnt = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4182 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4183
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4184 return cnt;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4185 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4186
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4187 template <typename T>
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4188 std::istream&
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4189 octave_scan_1 (std::istream& is, const scanf_format_elt& fmt,
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23446 diff changeset	4190 T *valptr)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4191 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4192 T value = T ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4193
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4194 switch (fmt.type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4195 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4196 case 'o':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4197 is >> std::oct >> value >> std::dec;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4198 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4199
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4200 case 'x':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4201 is >> std::hex >> value >> std::dec;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4202 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4203
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4204 case 'i':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4205 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4206 int c1 = std::istream::traits_type::eof ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4207
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4208 while (is && (c1 = is.get ()) != std::istream::traits_type::eof ()
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4209 && isspace (c1))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4210 ; // skip whitespace
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4211
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4212 if (c1 != std::istream::traits_type::eof ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4213 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4214 if (c1 == '0')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4215 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4216 int c2 = is.peek ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4217
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4218 if (c2 == 'x' \|\| c2 == 'X')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4219 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4220 is.ignore ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4221 if (std::isxdigit (is.peek ()))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4222 is >> std::hex >> value >> std::dec;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4223 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4224 value = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4225 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4226 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4227 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4228 if (c2 == '0' \|\| c2 == '1' \|\| c2 == '2'
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4229 \|\| c2 == '3' \|\| c2 == '4' \|\| c2 == '5'
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4230 \|\| c2 == '6' \|\| c2 == '7')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4231 is >> std::oct >> value >> std::dec;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4232 else if (c2 == '8' \|\| c2 == '9')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4233 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4234 // FIXME: Would like to set error state on octave
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4235 // stream. See bug #46493. But only std::istream is
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4236 // input to fcn.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4237 // error ("internal failure to match octal format");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4238 value = 0;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4239 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4240 else
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4241 value = 0;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4242 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4243 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4244 else
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4245 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4246 is.putback (c1);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4247
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4248 is >> value;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4249 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4250 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4251 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4252 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4253
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4254 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4255 is >> value;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4256 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4257 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4258
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4259 // If conversion produces an integer that overflows, failbit is set but
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4260 // value is non-zero. We want to treat this case as success, so clear
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4261 // failbit from the stream state to keep going.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4262 // FIXME: Maybe set error state on octave stream as above? Matlab does
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4263 // not indicate an error message on overflow.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4264 if ((is.rdstate () & std::ios::failbit) && value != T ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4265 is.clear (is.rdstate () & ~std::ios::failbit);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4266
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4267 // Only copy the converted value if the stream is in a state where we
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4268 // want to continue reading.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4269 if (! (is.rdstate () & std::ios::failbit))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4270 *valptr = value;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4271
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4272 return is;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4273 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4274
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4275 template <typename T>
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4276 std::istream&
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23446 diff changeset	4277 octave_scan (std::istream& is, const scanf_format_elt& fmt, T *valptr)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4278 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4279 if (fmt.width)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4280 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4281 // Limit input to fmt.width characters by reading into a
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4282 // temporary stringstream buffer.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4283 std::string tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4284
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4285 is.width (fmt.width);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4286 is >> tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4287
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4288 std::istringstream ss (tmp);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4289
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4290 octave_scan_1 (ss, fmt, valptr);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4291 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4292 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4293 octave_scan_1 (is, fmt, valptr);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4294
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4295 return is;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4296 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4297
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4298 // Note that this specialization is only used for reading characters, not
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4299 // character strings. See BEGIN_S_CONVERSION for details.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4300
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4301 template <>
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4302 std::istream&
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4303 octave_scan<> (std::istream& is, const scanf_format_elt& /* fmt */,
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23446 diff changeset	4304 char *valptr)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4305 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4306 return is >> valptr;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4307 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4308
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4309 template <>
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4310 std::istream&
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23446 diff changeset	4311 octave_scan<> (std::istream& is, const scanf_format_elt& fmt, double *valptr)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4312 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4313 double& ref = *valptr;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4314
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4315 switch (fmt.type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4316 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4317 case 'e':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4318 case 'f':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4319 case 'g':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4320 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4321 int c1 = std::istream::traits_type::eof ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4322
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4323 while (is && (c1 = is.get ()) != std::istream::traits_type::eof ()
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4324 && isspace (c1))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4325 ; // skip whitespace
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4326
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4327 if (c1 != std::istream::traits_type::eof ())
9701 531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4328 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4329 is.putback (c1);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4330
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4331 ref = octave_read_value<double> (is);
9701 531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4332 }
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4333 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4334 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4335
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4336 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4337 panic_impossible ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4338 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4339 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4340
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4341 return is;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4342 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4343
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4344 template <typename T>
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4345 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4346 do_scanf_conv (std::istream& is, const scanf_format_elt& fmt,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4347 T valptr, Matrix& mval, double *data, octave_idx_type& idx,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4348 octave_idx_type& conversion_count, octave_idx_type nr,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4349 octave_idx_type max_size, bool discard)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4350 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4351 octave_scan (is, fmt, valptr);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4352
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4353 if (! is)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4354 return;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4355
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4356 if (idx == max_size && ! discard)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4357 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4358 max_size *= 2;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4359
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4360 if (nr > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4361 mval.resize (nr, max_size / nr, 0.0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4362 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4363 mval.resize (max_size, 1, 0.0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4364
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4365 data = mval.fortran_vec ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4366 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4367
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4368 if (! discard)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4369 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4370 conversion_count++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4371 data[idx++] = *(valptr);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4372 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4373 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4374
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4375 template void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4376 do_scanf_conv (std::istream&, const scanf_format_elt&, double*,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4377 Matrix&, double*, octave_idx_type&, octave_idx_type&,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4378 octave_idx_type, octave_idx_type, bool);
2572 5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	4379
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4380 #define DO_WHITESPACE_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4381 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4382 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4383 int c = std::istream::traits_type::eof (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4384 \
21184 3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4385 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	4386 && isspace (c)) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4387 { /* skip whitespace */ } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4388 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4389 if (c != std::istream::traits_type::eof ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4390 is.putback (c); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4391 } \
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4392 while (0)
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4393
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4394 #define DO_LITERAL_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4395 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4396 { \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4397 int c = std::istream::traits_type::eof (); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4398 \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4399 int n = strlen (fmt); \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4400 int i = 0; \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4401 \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4402 while (i < n && is && (c = is.get ()) != std::istream::traits_type::eof ()) \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4403 { \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4404 if (c == static_cast<unsigned char> (fmt[i])) \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4405 { \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4406 i++; \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4407 continue; \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4408 } \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4409 else \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4410 { \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4411 is.putback (c); \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4412 break; \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4413 } \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4414 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4415 \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4416 if (i != n) \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4417 is.setstate (std::ios::failbit); \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4418 } \
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4419 while (0)
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4420
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4421 #define DO_PCT_CONVERSION() \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4422 do \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4423 { \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4424 int c = is.get (); \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4425 \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4426 if (c != std::istream::traits_type::eof ()) \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4427 { \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4428 if (c != '%') \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4429 { \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4430 is.putback (c); \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4431 is.setstate (std::ios::failbit); \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4432 } \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4433 } \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4434 else \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4435 is.setstate (std::ios::failbit); \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4436 } \
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	4437 while (0)
d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	4438
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4439 #define BEGIN_C_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4440 is.unsetf (std::ios::skipws); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4441 \
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	4442 int width = (elt->width ? elt->width : 1); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4443 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4444 std::string tmp (width, '\0'); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4445 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4446 int c = std::istream::traits_type::eof (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4447 int n = 0; \
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 while (is && n < width \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4450 && (c = is.get ()) != std::istream::traits_type::eof ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4451 tmp[n++] = static_cast<char> (c); \
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 (n > 0 && c == std::istream::traits_type::eof ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4454 is.clear (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4455 \
12984 7626f8934466 correctly resize scanf output for %c formats (bug #34037) John W. Eaton <jwe@octave.org> parents: 12966 diff changeset	4456 tmp.resize (n)
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4457
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4458 // For a '%s' format, skip initial whitespace and then read until the
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4459 // 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	4460 #define BEGIN_S_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4461 int width = elt->width; \
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 std::string tmp; \
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 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4466 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4467 if (width) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4468 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4469 tmp = std::string (width, '\0'); \
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 int c = std::istream::traits_type::eof (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4472 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4473 int n = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4474 \
21184 3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4475 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	4476 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4477 if (! isspace (c)) \
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 tmp[n++] = static_cast<char> (c); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4480 break; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4481 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4482 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4483 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4484 while (is && n < width \
21184 3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4485 && (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	4486 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4487 if (isspace (c)) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4488 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4489 is.putback (c); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4490 break; \
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 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4493 tmp[n++] = static_cast<char> (c); \
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 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4496 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	4497 is.clear (); \
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 tmp.resize (n); \
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 else \
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 is >> std::ws >> tmp; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4504 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4505 } \
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4506 while (0)
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4507
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4508 // 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	4509 #define BEGIN_CHAR_CLASS_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4510 int width = elt->width; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4511 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4512 std::string tmp; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4513 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4514 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4515 { \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4516 if (! width) \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4517 width = std::numeric_limits<int>::max (); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4518 \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4519 std::ostringstream buf; \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4520 \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4521 std::string char_class = elt->char_class; \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4522 \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4523 int c = std::istream::traits_type::eof (); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4524 \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4525 if (elt->type == '[') \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4526 { \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4527 int chars_read = 0; \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4528 while (is && chars_read++ < width \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4529 && (c = is.get ()) != std::istream::traits_type::eof () \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4530 && char_class.find (c) != std::string::npos) \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4531 buf << static_cast<char> (c); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4532 } \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4533 else \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4534 { \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4535 int chars_read = 0; \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4536 while (is && chars_read++ < width \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4537 && (c = is.get ()) != std::istream::traits_type::eof () \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4538 && char_class.find (c) == std::string::npos) \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4539 buf << static_cast<char> (c); \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4540 } \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4541 \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4542 if (width == std::numeric_limits<int>::max () \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4543 && c != std::istream::traits_type::eof ()) \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4544 is.putback (c); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4545 \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4546 tmp = buf.str (); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4547 \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4548 if (tmp.empty ()) \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4549 is.setstate (std::ios::failbit); \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4550 else if (c == std::istream::traits_type::eof ()) \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4551 is.clear (); \
22197 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 } \
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4554 while (0)
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4555
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4556 #define FINISH_CHARACTER_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4557 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4558 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4559 width = tmp.length (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4560 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4561 if (is) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4562 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4563 int i = 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 if (! discard) \
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 conversion_count++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4568 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4569 while (i < width) \
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 if (data_index == max_size) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4572 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4573 max_size *= 2; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4574 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4575 if (all_char_conv) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4576 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4577 if (one_elt_size_spec) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4578 mval.resize (1, max_size, 0.0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4579 else if (nr > 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4580 mval.resize (nr, max_size / nr, 0.0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4581 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4582 panic_impossible (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4583 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4584 else if (nr > 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4585 mval.resize (nr, max_size / nr, 0.0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4586 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4587 mval.resize (max_size, 1, 0.0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4588 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4589 data = mval.fortran_vec (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4590 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4591 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4592 data[data_index++] = tmp[i++]; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4593 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4594 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4595 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4596 } \
3410 ee5f222025c3 [project @ 2000-01-07 04:19:05 by jwe] jwe parents: 3342 diff changeset	4597 while (0)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4598
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4599 octave_value
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4600 base_stream::do_scanf (scanf_format_list& fmt_list,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4601 octave_idx_type nr, octave_idx_type nc,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4602 bool one_elt_size_spec,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4603 octave_idx_type& conversion_count,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4604 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4605 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4606 if (octave::application::interactive () && file_number () == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4607 ::error ("%s: unable to read from stdin while running interactively",
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4608 who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4609
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4610 octave_value retval = Matrix ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4611
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4612 conversion_count = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4613
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4614 octave_idx_type nconv = fmt_list.num_conversions ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4615
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4616 octave_idx_type data_index = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4617
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4618 if (nr == 0 \|\| nc == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4619 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4620 if (one_elt_size_spec)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4621 nc = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4622
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4623 return Matrix (nr, nc, 0.0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4624 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4625
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4626 std::istream *isp = input_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4627
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4628 bool all_char_conv = fmt_list.all_character_conversions ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4629
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4630 Matrix mval;
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23450 diff changeset	4631 double *data = nullptr;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4632 octave_idx_type max_size = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4633 octave_idx_type max_conv = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4634
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4635 octave_idx_type final_nr = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4636 octave_idx_type final_nc = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4637
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4638 if (all_char_conv)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4639 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4640 // Any of these could be resized later (if we have %s conversions,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4641 // we may read more than one element for each conversion).
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4642 if (one_elt_size_spec)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4643 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4644 max_size = 512;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4645 mval.resize (1, max_size, 0.0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4646
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4647 if (nr > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4648 max_conv = nr;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4649 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4650 else if (nr > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4651 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4652 if (nc > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4653 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4654 mval.resize (nr, nc, 0.0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4655 max_size = max_conv = nr * nc;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4656 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4657 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4658 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4659 mval.resize (nr, 32, 0.0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4660 max_size = nr * 32;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4661 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4662 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4663 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4664 panic_impossible ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4665 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4666 else if (nr > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4667 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4668 if (nc > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4669 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4670 // Will not resize later.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4671 mval.resize (nr, nc, 0.0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4672 max_size = nr * nc;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4673 max_conv = max_size;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4674 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4675 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4676 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4677 // Maybe resize later.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4678 mval.resize (nr, 32, 0.0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4679 max_size = nr * 32;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4680 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4681 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4682 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4683 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4684 // Maybe resize later.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4685 mval.resize (32, 1, 0.0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4686 max_size = 32;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4687 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4688
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4689 data = mval.fortran_vec ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4690
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4691 if (isp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4692 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4693 std::istream& is = *isp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4694
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4695 const scanf_format_elt *elt = fmt_list.first ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4696
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4697 std::ios::fmtflags flags = is.flags ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4698
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4699 octave_idx_type trips = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4700
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4701 octave_idx_type num_fmt_elts = fmt_list.length ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4702
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4703 for (;;)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4704 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4705 octave_quit ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4706
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4707 if (elt)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4708 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4709 if (elt->type == scanf_format_elt::null
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4710 \|\| (! (elt->type == scanf_format_elt::whitespace_conversion
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4711 \|\| elt->type == scanf_format_elt::literal_conversion
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4712 \|\| elt->type == '%')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4713 && max_conv > 0 && conversion_count == max_conv))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4714 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4715 // We are done, either because we have reached the end of the
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4716 // format string and are not cycling through the format again
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4717 // or because we've converted all the values that have been
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4718 // requested and the next format element is a conversion.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4719 // Determine final array size and exit.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4720 if (all_char_conv && one_elt_size_spec)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4721 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4722 final_nr = 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4723 final_nc = data_index;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4724 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4725 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4726 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4727 final_nr = nr;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4728 final_nc = (data_index - 1) / nr + 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4729 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4730
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4731 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4732 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4733 else if (data_index == max_size)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4734 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4735 max_size *= 2;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4736
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4737 if (all_char_conv)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4738 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4739 if (one_elt_size_spec)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4740 mval.resize (1, max_size, 0.0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4741 else if (nr > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4742 mval.resize (nr, max_size / nr, 0.0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4743 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4744 panic_impossible ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4745 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4746 else if (nr > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4747 mval.resize (nr, max_size / nr, 0.0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4748 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4749 mval.resize (max_size, 1, 0.0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4750
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4751 data = mval.fortran_vec ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4752 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4753
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4754 const char *fmt = elt->text;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4755
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4756 bool discard = elt->discard;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4757
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4758 switch (elt->type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4759 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4760 case scanf_format_elt::whitespace_conversion:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4761 DO_WHITESPACE_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4762 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4763
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4764 case scanf_format_elt::literal_conversion:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4765 DO_LITERAL_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4766 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4767
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4768 case '%':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4769 DO_PCT_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4770 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4771
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4772 case 'd': case 'i':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4773 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4774 switch (elt->modifier)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4775 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4776 case 'h':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4777 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4778 int16_t tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4779 do_scanf_conv (is, *elt, &tmp, mval, data,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4780 data_index, conversion_count,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4781 nr, max_size, discard);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4782 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4783 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4784
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4785 case 'l':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4786 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4787 int64_t tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4788 do_scanf_conv (is, *elt, &tmp, mval, data,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4789 data_index, conversion_count,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4790 nr, max_size, discard);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4791 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4792 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4793
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4794 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4795 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4796 int32_t tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4797 do_scanf_conv (is, *elt, &tmp, mval, data,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4798 data_index, conversion_count,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4799 nr, max_size, discard);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4800 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4801 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4802 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4803 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4804 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4805
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4806 case 'o': case 'u': case 'x':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4807 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4808 switch (elt->modifier)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4809 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4810 case 'h':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4811 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4812 uint16_t tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4813 do_scanf_conv (is, *elt, &tmp, mval, data,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4814 data_index, conversion_count,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4815 nr, max_size, discard);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4816 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4817 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4818
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4819 case 'l':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4820 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4821 uint64_t tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4822 do_scanf_conv (is, *elt, &tmp, mval, data,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4823 data_index, conversion_count,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4824 nr, max_size, discard);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4825 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4826 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4827
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4828 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4829 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4830 uint32_t tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4831 do_scanf_conv (is, *elt, &tmp, mval, data,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4832 data_index, conversion_count,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4833 nr, max_size, discard);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4834 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4835 break;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4836 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4837 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4838 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4839
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4840 case 'e': case 'f': case 'g':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4841 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4842 double tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4843
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4844 do_scanf_conv (is, *elt, &tmp, mval, data,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4845 data_index, conversion_count,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4846 nr, max_size, discard);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4847 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4848 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4849
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4850 case 'c':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4851 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4852 BEGIN_C_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4853
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4854 FINISH_CHARACTER_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4855
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4856 is.setf (flags);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4857 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4858 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4859
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4860 case 's':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4861 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4862 BEGIN_S_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4863
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4864 FINISH_CHARACTER_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4865 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4866 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4867
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4868 case '[': case '^':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4869 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4870 BEGIN_CHAR_CLASS_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4871
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4872 FINISH_CHARACTER_CONVERSION ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4873 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4874 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4875
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4876 case 'p':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4877 error ("%s: unsupported format specifier", who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4878 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4879
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4880 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4881 error ("%s: internal format error", who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4882 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4883 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4884
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4885 if (! ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4886 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4887 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4888 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4889 else if (! is)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4890 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4891 if (all_char_conv)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4892 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4893 if (one_elt_size_spec)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4894 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4895 final_nr = 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4896 final_nc = data_index;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4897 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4898 else if (data_index > nr)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4899 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4900 final_nr = nr;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4901 final_nc = (data_index - 1) / nr + 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4902 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4903 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4904 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4905 final_nr = data_index;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4906 final_nc = 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4907 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4908 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4909 else if (nr > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4910 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4911 if (data_index > nr)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4912 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4913 final_nr = nr;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4914 final_nc = (data_index - 1) / nr + 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4915 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4916 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4917 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4918 final_nr = data_index;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4919 final_nc = 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4920 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4921 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4922 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4923 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4924 final_nr = data_index;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4925 final_nc = 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4926 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4927
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4928 // If it looks like we have a matching failure, then
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4929 // reset the failbit in the stream state.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4930 if (is.rdstate () & std::ios::failbit)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4931 is.clear (is.rdstate () & (~std::ios::failbit));
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4932
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4933 // FIXME: is this the right thing to do?
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4934 if (octave::application::interactive ()
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4935 && ! octave::application::forced_interactive ()
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4936 && name () == "stdin")
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4937 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4938 is.clear ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4939
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4940 // Skip to end of line.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4941 bool err;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4942 do_gets (-1, err, false, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4943 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4944
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4945 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4946 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4947 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4948 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4949 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4950 error ("%s: internal format error", who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4951 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4952 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4953
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4954 if (nconv == 0 && ++trips == num_fmt_elts)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4955 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4956 if (all_char_conv && one_elt_size_spec)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4957 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4958 final_nr = 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4959 final_nc = data_index;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4960 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4961 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4962 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4963 final_nr = nr;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4964 final_nc = (data_index - 1) / nr + 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4965 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4966
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4967 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4968 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4969 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4970 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4971 // Cycle through the format list more than once if we have some
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4972 // conversions to make and we haven't reached the limit on the
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4973 // number of values to convert (possibly because there is no
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4974 // specified limit).
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4975 elt = fmt_list.next (nconv > 0
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4976 && (max_conv == 0
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4977 \|\| conversion_count < max_conv));
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4978 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4979 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4980 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4981
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4982 if (ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4983 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4984 mval.resize (final_nr, final_nc, 0.0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4985
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4986 retval = mval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4987
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4988 if (all_char_conv)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4989 retval = retval.convert_to_str (false, true);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4990 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4991
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4992 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4993 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4994
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4995 octave_value
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4996 base_stream::scanf (const std::string& fmt, const Array<double>& size,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4997 octave_idx_type& conversion_count,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4998 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4999 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5000 octave_value retval = Matrix ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5001
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5002 conversion_count = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5003
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5004 std::istream *isp = input_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5005
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5006 if (! isp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5007 invalid_operation (who, "reading");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5008 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5009 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5010 scanf_format_list fmt_list (fmt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5011
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5012 if (fmt_list.num_conversions () == -1)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5013 ::error ("%s: invalid format specified", who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5014
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5015 octave_idx_type nr = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5016 octave_idx_type nc = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5017
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5018 bool one_elt_size_spec;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5019
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5020 get_size (size, nr, nc, one_elt_size_spec, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5021
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5022 retval = do_scanf (fmt_list, nr, nc, one_elt_size_spec,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5023 conversion_count, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5024 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5025
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5026 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5027 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5028
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5029 bool
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5030 base_stream::do_oscanf (const scanf_format_elt *elt,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5031 octave_value& retval, const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5032 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5033 std::istream *isp = input_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5034
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5035 if (! isp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5036 return false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5037
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5038 bool quit = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5039
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5040 std::istream& is = *isp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5041
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5042 std::ios::fmtflags flags = is.flags ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5043
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5044 if (elt)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5045 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5046 const char *fmt = elt->text;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5047
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5048 bool discard = elt->discard;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5049
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5050 switch (elt->type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5051 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5052 case scanf_format_elt::whitespace_conversion:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5053 DO_WHITESPACE_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5054 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5055
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5056 case scanf_format_elt::literal_conversion:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5057 DO_LITERAL_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5058 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5059
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5060 case '%':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5061 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5062 DO_PCT_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5063
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5064 if (! is)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5065 quit = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5066 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5067 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5068
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5069 case 'd': case 'i':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5070 {
23965 6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5071 switch (elt->modifier)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5072 {
23965 6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5073 case 'h':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5074 {
23965 6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5075 int16_t tmp;
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5076 if (octave_scan (is, *elt, &tmp))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5077 {
23965 6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5078 if (! discard)
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5079 retval = tmp;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5080 }
23965 6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5081 else
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5082 quit = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5083 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5084 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5085
23965 6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5086 case 'l':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5087 {
23965 6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5088 int64_t tmp;
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5089 if (octave_scan (is, *elt, &tmp))
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5090 {
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5091 if (! discard)
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5092 retval = tmp;
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5093 }
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5094 else
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5095 quit = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5096 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5097 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5098
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5099 default:
23965 6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5100 {
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5101 int32_t tmp;
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5102 if (octave_scan (is, *elt, &tmp))
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5103 {
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5104 if (! discard)
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5105 retval = tmp;
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5106 }
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5107 else
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5108 quit = true;
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5109 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5110 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5111 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5112 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5113 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5114
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5115 case 'o': case 'u': case 'x':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5116 {
23965 6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5117 switch (elt->modifier)
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	5118 {
23965 6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5119 case 'h':
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5120 {
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5121 uint16_t tmp;
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5122 if (octave_scan (is, *elt, &tmp))
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5123 {
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5124 if (! discard)
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5125 retval = tmp;
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5126 }
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5127 else
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5128 quit = true;
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5129 }
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5130 break;
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5131
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5132 case 'l':
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5133 {
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5134 uint64_t tmp;
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5135 if (octave_scan (is, *elt, &tmp))
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5136 {
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5137 if (! discard)
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5138 retval = tmp;
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5139 }
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5140 else
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5141 quit = true;
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5142 }
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5143 break;
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5144
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5145 default:
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5146 {
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5147 uint32_t tmp;
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5148 if (octave_scan (is, *elt, &tmp))
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5149 {
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5150 if (! discard)
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5151 retval = tmp;
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5152 }
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5153 else
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5154 quit = true;
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5155 }
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5156 break;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5157 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5158 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5159 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5160
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5161 case 'e': case 'f': case 'g':
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	5162 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5163 double tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5164
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5165 if (octave_scan (is, *elt, &tmp))
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	5166 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5167 if (! discard)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5168 retval = tmp;
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	5169 }
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	5170 else
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5171 quit = true;
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	5172 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5173 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5174
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5175 case 'c':
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	5176 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5177 BEGIN_C_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5178
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5179 if (! discard)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5180 retval = tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5181
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5182 if (! is)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5183 quit = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5184
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5185 is.setf (flags);
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	5186 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5187 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5188
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5189 case 's':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5190 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5191 BEGIN_S_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5192
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5193 if (! discard)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5194 retval = tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5195
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5196 if (! is)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5197 quit = true;
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	5198 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5199 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5200
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5201 case '[':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5202 case '^':
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	5203 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5204 BEGIN_CHAR_CLASS_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5205
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5206 if (! discard)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5207 retval = tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5208
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5209 if (! is)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5210 quit = true;
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	5211 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5212 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5213
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5214 case 'p':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5215 error ("%s: unsupported format specifier", who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5216 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5217
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5218 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5219 error ("%s: internal format error", who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5220 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5221 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5222 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5223
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5224 if (ok () && is.fail ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5225 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5226 error ("%s: read error", who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5227
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5228 // FIXME: is this the right thing to do?
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5229
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5230 if (octave::application::interactive ()
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5231 && ! octave::application::forced_interactive ()
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5232 && name () == "stdin")
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5233 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5234 // Skip to end of line.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5235 bool err;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5236 do_gets (-1, err, false, who);
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5237 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5238 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5239
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5240 return quit;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5241 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5242
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5243 octave_value_list
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5244 base_stream::oscanf (const std::string& fmt, const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5245 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5246 octave_value_list retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5247
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5248 std::istream *isp = input_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5249
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5250 if (! isp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5251 invalid_operation (who, "reading");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5252 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5253 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5254 std::istream& is = *isp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5255
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5256 scanf_format_list fmt_list (fmt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5257
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5258 octave_idx_type nconv = fmt_list.num_conversions ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5259
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5260 if (nconv == -1)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5261 ::error ("%s: invalid format specified", who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5262
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5263 is.clear ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5264
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5265 octave_idx_type len = fmt_list.length ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5266
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5267 retval.resize (nconv+2, Matrix ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5268
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5269 const scanf_format_elt *elt = fmt_list.first ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5270
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5271 int num_values = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5272
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5273 bool quit = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5274
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5275 for (octave_idx_type i = 0; i < len; i++)
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5276 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5277 octave_value tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5278
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5279 quit = do_oscanf (elt, tmp, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5280
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5281 if (quit)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5282 break;
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5283 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5284 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5285 if (tmp.is_defined ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5286 retval(num_values++) = tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5287
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5288 if (! ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5289 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5290
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5291 elt = fmt_list.next (nconv > 0);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5292 }
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5293 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5294
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5295 retval(nconv) = num_values;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5296
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5297 int err_num;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5298 retval(nconv+1) = error (false, err_num);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5299
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5300 if (! quit)
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5301 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5302 // Pick up any trailing stuff.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5303 if (ok () && len > nconv)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5304 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5305 octave_value tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5306
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5307 elt = fmt_list.next ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5308
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5309 do_oscanf (elt, tmp, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5310 }
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5311 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5312 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5313
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5314 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5315 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5316
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5317 octave_value
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5318 base_stream::do_textscan (const std::string& fmt,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5319 octave_idx_type ntimes,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5320 const octave_value_list& options,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5321 const std::string& who,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5322 octave_idx_type& read_count)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5323 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5324 if (octave::application::interactive () && file_number () == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5325 ::error ("%s: unable to read from stdin while running interactively",
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5326 who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5327
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5328 octave_value retval = Cell (dim_vector (1, 1), Matrix (0, 1));
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5329
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5330 std::istream *isp = input_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5331
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5332 if (! isp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5333 invalid_operation (who, "reading");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5334 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5335 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5336 octave::textscan scanner (who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5337
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5338 retval = scanner.scan (*isp, fmt, ntimes, options, read_count);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5339 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5340
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5341 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5342 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5343
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5344 // Functions that are defined for all output streams
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5345 // (output streams are those that define os).
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5346
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5347 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5348 base_stream::flush (void)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5349 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5350 int retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5351
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5352 std::ostream *os = output_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5353
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5354 if (! os)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5355 invalid_operation ("fflush", "writing");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5356 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5357 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5358 os->flush ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5359
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5360 if (os->good ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5361 retval = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5362 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5363
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5364 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5365 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5366
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5367 class
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5368 printf_value_cache
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5369 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5370 public:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5371
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5372 enum state { ok, conversion_error };
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5373
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5374 printf_value_cache (const octave_value_list& args, const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5375 : values (args), val_idx (0), elt_idx (0),
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5376 n_vals (values.length ()), n_elts (0), have_data (false),
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5377 curr_state (ok)
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5378 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5379 for (octave_idx_type i = 0; i < values.length (); i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5380 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5381 octave_value val = values(i);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5382
23587 0c468af9dc00 maint: Deprecate is_object and replace with isobject. Rik <rik@octave.org> parents: 23584 diff changeset	5383 if (val.isstruct () \|\| val.iscell () \|\| val.isobject ())
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5384 err_wrong_type_arg (who, val);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5385 }
2215 ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5386 }
ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5387
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5388 // No copying!
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5389
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5390 printf_value_cache (const printf_value_cache&) = delete;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5391
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5392 printf_value_cache& operator = (const printf_value_cache&) = delete;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5393
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5394 ~printf_value_cache (void) = default;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5395
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5396 // Get the current value as a double and advance the internal pointer.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5397 octave_value get_next_value (char type = 0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5398
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5399 // Get the current value as an int and advance the internal pointer.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5400 int int_value (void);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5401
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5402 operator bool () const { return (curr_state == ok); }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5403
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5404 bool exhausted (void) { return (val_idx >= n_vals); }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5405
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5406 private:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5407
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5408 const octave_value_list values;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5409 int val_idx;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5410 int elt_idx;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5411 int n_vals;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5412 int n_elts;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5413 bool have_data;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5414 octave_value curr_val;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5415 state curr_state;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5416
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5417 // Must create value cache with values!
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5418
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5419 printf_value_cache (void);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5420 };
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5421
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5422 octave_value
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5423 printf_value_cache::get_next_value (char type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5424 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5425 octave_value retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5426
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5427 if (exhausted ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5428 curr_state = conversion_error;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5429
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5430 while (! exhausted ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5431 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5432 if (! have_data)
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5433 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5434 curr_val = values (val_idx);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5435
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5436 elt_idx = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5437 n_elts = curr_val.numel ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5438 have_data = true;
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5439 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5440
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5441 if (elt_idx < n_elts)
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5442 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5443 if (type == 's')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5444 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5445 if (curr_val.is_string ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5446 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5447 dim_vector dv (1, curr_val.numel ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5448 octave_value tmp = curr_val.reshape (dv);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5449
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5450 std::string sval = tmp.string_value ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5451
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5452 retval = sval.substr (elt_idx);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5453
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5454 // We've consumed the rest of the value.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5455 elt_idx = n_elts;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5456 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5457 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5458 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5459 // Convert to character string while values are
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5460 // integers in the range [0 : char max]
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5461 const NDArray val = curr_val.array_value ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5462
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5463 octave_idx_type idx = elt_idx;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5464
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5465 for (; idx < n_elts; idx++)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5466 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5467 double dval = val(idx);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5468
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5469 if (octave::math::x_nint (dval) != dval \|\| dval < 0 \|\| dval > 255)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5470 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5471 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5472
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5473 octave_idx_type n = idx - elt_idx;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5474
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5475 if (n > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5476 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5477 std::string sval (n, '\0');
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5478
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5479 for (octave_idx_type i = 0; i < n; i++)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5480 sval[i] = val(elt_idx++);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5481
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5482 retval = sval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5483 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5484 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5485 retval = curr_val.fast_elem_extract (elt_idx++);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5486 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5487 }
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5488 else
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5489 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5490 retval = curr_val.fast_elem_extract (elt_idx++);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5491
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5492 if (type == 'c' && ! retval.is_string ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5493 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5494 double dval = retval.double_value ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5495
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5496 if (octave::math::x_nint (dval) == dval && dval >= 0 && dval < 256)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5497 retval = static_cast<char> (dval);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5498 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5499 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5500
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5501 if (elt_idx >= n_elts)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5502 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5503 elt_idx = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5504 val_idx++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5505 have_data = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5506 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5507
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5508 break;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5509 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5510 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5511 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5512 val_idx++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5513 have_data = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5514
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5515 if (n_elts == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5516 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5517 if (elt_idx == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5518 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5519 if (type == 's' \|\| type == 'c')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5520 retval = "";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5521 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5522 retval = Matrix ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5523
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5524 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5525 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5526
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5527 if (exhausted ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5528 curr_state = conversion_error;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5529 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5530 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5531 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5532
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5533 return retval;
7352 fab9bc33b949 [project @ 2008-01-07 18:54:45 by jwe] jwe parents: 7227 diff changeset	5534 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5535
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5536 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5537 printf_value_cache::int_value (void)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5538 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5539 int retval = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5540
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5541 octave_value val = get_next_value ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5542
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5543 double dval = val.double_value (true);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5544
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5545 if (octave::math::x_nint (dval) == dval)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5546 retval = octave::math::nint (dval);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5547 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5548 curr_state = conversion_error;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5549
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5550 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5551 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5552
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5553 // Ugh again and again.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5554
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5555 template <typename T>
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5556 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5557 do_printf_conv (std::ostream& os, const char *fmt, int nsa, int sa_1,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5558 int sa_2, T arg, const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5559 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5560 int retval = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5561
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5562 switch (nsa)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5563 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5564 case 2:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5565 retval = octave_format (os, fmt, sa_1, sa_2, arg);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5566 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5567
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5568 case 1:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5569 retval = octave_format (os, fmt, sa_1, arg);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5570 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5571
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5572 case 0:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5573 retval = octave_format (os, fmt, arg);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5574 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5575
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5576 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5577 ::error ("%s: internal error handling format", who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5578 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5579 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5580
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5581 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5582 }
2572 5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5583 }
5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	5584
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5585 static size_t
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5586 do_printf_string (std::ostream& os, const octave::printf_format_elt *elt,
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5587 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	5588 const std::string& who)
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5589 {
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5590 if (nsa > 2)
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20768 diff changeset	5591 ::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	5592
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5593 std::string flags = elt->flags;
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5594
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5595 bool left = flags.find ('-') != std::string::npos;
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5596
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5597 size_t len = arg.length ();
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5598
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	5599 size_t fw = (nsa > 0 ? sa_1 : (elt->fw == -1 ? len : elt->fw));
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	5600 size_t prec = (nsa > 1 ? sa_2 : (elt->prec == -1 ? len : elt->prec));
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5601
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5602 os << std::setw (fw)
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5603 << (left ? std::left : std::right)
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5604 << (prec < len ? arg.substr (0, prec) : arg);
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5605
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5606 return len > fw ? len : fw;
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5607 }
17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5608
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5609 static bool
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5610 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	5611 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5612 octave_value ov_isnan = val.isnan ();
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5613 octave_value ov_isinf = val.isinf ();
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5614
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5615 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	5616 }
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 static bool
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5619 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	5620 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5621 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	5622
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5623 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	5624 return true;
23580 2230f9e10fb3 maint: Deprecate is_integer_type and replace with isinteger. Rik <rik@octave.org> parents: 23577 diff changeset	5625 else if (val.isinteger ())
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5626 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5627 if (val.is_uint64_type ())
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5628 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5629 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	5630
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5631 if (ival.value () <= limit)
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5632 return true;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5633 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5634 else
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5635 return true;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5636 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5637 else
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5638 {
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5639 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	5640
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21777 diff changeset	5641 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	5642 return true;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5643 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5644
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5645 return false;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5646 }
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 static bool
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5649 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	5650 {
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5651 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	5652 return true;
23580 2230f9e10fb3 maint: Deprecate is_integer_type and replace with isinteger. Rik <rik@octave.org> parents: 23577 diff changeset	5653 else if (val.isinteger ())
18653 7d0014bb9e4e also switch from unsigned integer to real format for negative values John W. Eaton <jwe@octave.org> parents: 18650 diff changeset	5654 {
7d0014bb9e4e also switch from unsigned integer to real format for negative values John W. Eaton <jwe@octave.org> parents: 18650 diff changeset	5655 // 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	5656
7d0014bb9e4e also switch from unsigned integer to real format for negative values John W. Eaton <jwe@octave.org> parents: 18650 diff changeset	5657 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	5658 = 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	5659
7d0014bb9e4e also switch from unsigned integer to real format for negative values John W. Eaton <jwe@octave.org> parents: 18650 diff changeset	5660 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	5661 }
18650 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 {
19729 17a7e9f26e50 improve compatibility of printf functions John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	5664 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	5665
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5666 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	5667
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21777 diff changeset	5668 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	5669 return true;
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
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5672 return false;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5673 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5674
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5675 static std::string
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5676 switch_to_g_format (const octave::printf_format_elt *elt)
18650 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 std::string tfmt = elt->text;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5679
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5680 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	5681
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5682 return tfmt;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5683 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18620 diff changeset	5684
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5685 namespace octave
3340 585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	5686 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5687 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5688 base_stream::do_numeric_printf_conv (std::ostream& os,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5689 const printf_format_elt *elt,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5690 int nsa, int sa_1, int sa_2,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5691 const octave_value& val,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5692 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5693 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5694 int retval = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5695
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5696 const char *fmt = elt->text;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5697
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5698 if (is_nan_or_inf (val))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5699 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5700 double dval = val.double_value ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5701
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5702 std::string tfmt = fmt;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5703 std::string::size_type i1, i2;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5704
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5705 tfmt.replace ((i1 = tfmt.rfind (elt->type)), 1, 1, 's');
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5706
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5707 if ((i2 = tfmt.rfind ('.')) != std::string::npos && i2 < i1)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5708 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5709 tfmt.erase (i2, i1-i2);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5710 if (elt->prec == -2)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5711 nsa--;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5712 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5713
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5714 const char *tval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5715 if (lo_ieee_isinf (dval))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5716 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5717 if (elt->flags.find ('+') != std::string::npos)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5718 tval = (dval < 0 ? "-Inf" : "+Inf");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5719 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5720 tval = (dval < 0 ? "-Inf" : "Inf");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5721 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5722 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5723 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5724 if (elt->flags.find ('+') != std::string::npos)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5725 tval = (lo_ieee_is_NA (dval) ? "+NA" : "+NaN");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5726 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5727 tval = (lo_ieee_is_NA (dval) ? "NA" : "NaN");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5728 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5729
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5730 retval += do_printf_conv (os, tfmt.c_str (), nsa, sa_1, sa_2, tval, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5731 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5732 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5733 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5734 static std::string llmod
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	5735 = (sizeof (long) == sizeof (int64_t) ? "l" : "ll");
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5736
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5737 char type = elt->type;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5738
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5739 switch (type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5740 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5741 case 'd': case 'i': case 'c':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5742 if (ok_for_signed_int_conv (val))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5743 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5744 octave_int64 tval = val.int64_scalar_value ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5745
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5746 // Insert "long" modifier.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5747 std::string tfmt = fmt;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5748 tfmt.replace (tfmt.rfind (type), 1, llmod + type);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5749
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5750 retval += do_printf_conv (os, tfmt.c_str (), nsa, sa_1, sa_2,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5751 tval.value (), who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5752 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5753 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5754 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5755 std::string tfmt = switch_to_g_format (elt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5756
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5757 double dval = val.double_value (true);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5758
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5759 retval += do_printf_conv (os, tfmt.c_str (), nsa,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5760 sa_1, sa_2, dval, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5761 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5762 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5763
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5764 case 'o': case 'x': case 'X': case 'u':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5765 if (ok_for_unsigned_int_conv (val))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5766 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5767 octave_uint64 tval = val.uint64_scalar_value ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5768
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5769 // Insert "long" modifier.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5770 std::string tfmt = fmt;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5771 tfmt.replace (tfmt.rfind (type), 1, llmod + type);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5772
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5773 retval += do_printf_conv (os, tfmt.c_str (), nsa, sa_1, sa_2,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5774 tval.value (), who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5775 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5776 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5777 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5778 std::string tfmt = switch_to_g_format (elt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5779
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5780 double dval = val.double_value (true);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5781
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5782 retval += do_printf_conv (os, tfmt.c_str (), nsa,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5783 sa_1, sa_2, dval, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5784 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5785 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5786
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5787 case 'f': case 'e': case 'E':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5788 case 'g': case 'G':
9701 531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	5789 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5790 double dval = val.double_value (true);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5791
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5792 retval += do_printf_conv (os, fmt, nsa, sa_1, sa_2, dval, who);
9701 531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	5793 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5794 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5795
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5796 default:
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	5797 // Note: error is member fcn from base_stream, not ::error.
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5798 // This error does not halt execution so "return ..." must exist.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5799 error ("%s: invalid format specifier", who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5800 return -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5801 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5802 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5803 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5804
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5805 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5806 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5807
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5808 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5809 base_stream::do_printf (printf_format_list& fmt_list,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5810 const octave_value_list& args,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5811 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5812 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5813 int retval = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5814
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5815 octave_idx_type nconv = fmt_list.num_conversions ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5816
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5817 std::ostream *osp = output_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5818
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5819 if (! osp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5820 invalid_operation (who, "writing");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5821 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5822 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5823 std::ostream& os = *osp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5824
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5825 const printf_format_elt *elt = fmt_list.first ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5826
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5827 printf_value_cache val_cache (args, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5828
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5829 for (;;)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5830 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5831 octave_quit ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5832
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5833 if (! elt)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5834 ::error ("%s: internal error handling format", who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5835
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5836 // NSA is the number of 'star' args to convert.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5837 int nsa = (elt->fw == -2) + (elt->prec == -2);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5838
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5839 int sa_1 = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5840 int sa_2 = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5841
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5842 if (nsa > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5843 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5844 sa_1 = val_cache.int_value ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5845
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5846 if (! val_cache)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5847 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5848 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5849 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5850 if (nsa > 1)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5851 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5852 sa_2 = val_cache.int_value ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5853
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5854 if (! val_cache)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5855 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5856 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5857 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5858 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5859
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5860 if (elt->type == '%')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5861 {
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	5862 os << '%';
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5863 retval++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5864 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5865 else if (elt->args == 0 && elt->text)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5866 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5867 os << elt->text;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5868 retval += strlen (elt->text);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5869 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5870 else if (elt->type == 's' \|\| elt->type == 'c')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5871 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5872 octave_value val = val_cache.get_next_value (elt->type);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5873
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5874 if (val_cache)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5875 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5876 if (val.is_string ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5877 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5878 std::string sval = val.string_value ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5879
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5880 retval += do_printf_string (os, elt, nsa, sa_1,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5881 sa_2, sval, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5882 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5883 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5884 retval += do_numeric_printf_conv (os, elt, nsa, sa_1,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5885 sa_2, val, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5886 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5887 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5888 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5889 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5890 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5891 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5892 octave_value val = val_cache.get_next_value ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5893
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5894 if (val_cache)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5895 {
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	5896 if (! val.isempty ())
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5897 retval += do_numeric_printf_conv (os, elt, nsa, sa_1,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5898 sa_2, val, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5899 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5900 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5901 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5902 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5903
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5904 if (! os)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5905 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5906 error ("%s: write error", who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5907 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5908 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5909
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5910 elt = fmt_list.next (nconv > 0 && ! val_cache.exhausted ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5911
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5912 if (! elt \|\| (val_cache.exhausted () && elt->args > 0))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5913 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5914 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5915 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5916
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5917 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5918 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5919
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5920 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5921 base_stream::printf (const std::string& fmt,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5922 const octave_value_list& args,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5923 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5924 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5925 printf_format_list fmt_list (fmt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5926
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5927 if (fmt_list.num_conversions () == -1)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5928 ::error ("%s: invalid format specified", who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5929
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5930 return do_printf (fmt_list, args, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5931 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5932
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5933 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5934 base_stream::puts (const std::string& s, const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5935 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5936 int retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5937
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5938 std::ostream *osp = output_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5939
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5940 if (! osp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5941 invalid_operation (who, "writing");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5942 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5943 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5944 std::ostream& os = *osp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5945
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5946 os << s;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5947
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5948 if (! os)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5949 error ("%s: write error", who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5950 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5951 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5952 // FIXME: why does this seem to be necessary?
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5953 // Without it, output from a loop like
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5954 //
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5955 // for i = 1:100, fputs (stdout, "foo\n"); endfor
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5956 //
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5957 // doesn't seem to go to the pager immediately.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5958 os.flush ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5959
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5960 if (os)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5961 retval = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5962 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5963 error ("%s: write error", who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5964 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5965 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5966
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5967 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5968 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5969
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5970 // Return current error message for this stream.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5971
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5972 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5973 base_stream::error (bool clear_err, int& err_num)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5974 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	5975 err_num = (fail ? -1 : 0);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5976
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5977 std::string tmp = errmsg;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5978
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5979 if (clear_err)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5980 clear ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5981
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5982 return tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5983 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5984
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5985 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5986 base_stream::invalid_operation (const std::string& who, const char *rw)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5987 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5988 // Note: This calls the member fcn error, not ::error from error.h.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5989 error (who, std::string ("stream not open for ") + rw);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5990 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5991
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5992 stream::stream (base_stream *bs)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5993 : rep (bs)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5994 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5995 if (rep)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5996 rep->count = 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5997 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5998
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5999 stream::~stream (void)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6000 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6001 if (rep && --rep->count == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6002 delete rep;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6003 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6004
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6005 stream::stream (const stream& s)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6006 : rep (s.rep)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6007 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6008 if (rep)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6009 rep->count++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6010 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6011
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6012 stream&
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6013 stream::operator = (const stream& s)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6014 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6015 if (rep != s.rep)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6016 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6017 if (rep && --rep->count == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6018 delete rep;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6019
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6020 rep = s.rep;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6021
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6022 if (rep)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6023 rep->count++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6024 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6025
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6026 return *this;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6027 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6028
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6029 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6030 stream::flush (void)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6031 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6032 int retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6033
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6034 if (stream_ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6035 retval = rep->flush ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6036
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6037 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6038 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6039
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6040 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6041 stream::getl (octave_idx_type max_len, bool& err, const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6042 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6043 std::string retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6044
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6045 if (stream_ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6046 retval = rep->getl (max_len, err, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6047
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6048 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6049 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6050
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6051 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6052 stream::getl (const octave_value& tc_max_len, bool& err,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6053 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6054 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6055 err = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6056
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6057 int conv_err = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6058
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6059 int max_len = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6060
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6061 if (tc_max_len.is_defined ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6062 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6063 max_len = convert_to_valid_int (tc_max_len, conv_err);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6064
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6065 if (conv_err \|\| max_len < 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6066 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6067 err = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6068 ::error ("%s: invalid maximum length specified", who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6069 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6070 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6071
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6072 return getl (max_len, err, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6073 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6074
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6075 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6076 stream::gets (octave_idx_type max_len, bool& err, const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6077 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6078 std::string retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6079
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6080 if (stream_ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6081 retval = rep->gets (max_len, err, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6082
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6083 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6084 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6085
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6086 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6087 stream::gets (const octave_value& tc_max_len, bool& err,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6088 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6089 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6090 err = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6091
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6092 int conv_err = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6093
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6094 int max_len = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6095
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6096 if (tc_max_len.is_defined ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6097 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6098 max_len = convert_to_valid_int (tc_max_len, conv_err);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6099
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6100 if (conv_err \|\| max_len < 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6101 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6102 err = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6103 ::error ("%s: invalid maximum length specified", who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6104 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6105 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6106
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6107 return gets (max_len, err, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6108 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6109
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6110 off_t
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6111 stream::skipl (off_t count, bool& err, const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6112 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6113 off_t retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6114
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6115 if (stream_ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6116 retval = rep->skipl (count, err, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6117
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6118 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6119 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6120
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6121 off_t
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6122 stream::skipl (const octave_value& tc_count, bool& err,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6123 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6124 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6125 err = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6126
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6127 int conv_err = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6128
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6129 int count = 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6130
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6131 if (tc_count.is_defined ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6132 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6133 if (tc_count.is_scalar_type ()
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6134 && math::isinf (tc_count.scalar_value ()))
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6135 count = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6136 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6137 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6138 count = convert_to_valid_int (tc_count, conv_err);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6139
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6140 if (conv_err \|\| count < 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6141 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6142 err = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6143 ::error ("%s: invalid number of lines specified", who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6144 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6145 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6146 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6147
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6148 return skipl (count, err, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6149 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6150
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6151 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6152 stream::seek (off_t offset, int origin)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6153 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6154 int status = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6155
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6156 if (stream_ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6157 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6158 clearerr ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6159
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6160 // Find current position so we can return to it if needed.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6161 off_t orig_pos = rep->tell ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6162
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6163 // Move to end of file. If successful, find the offset of the end.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6164 status = rep->seek (0, SEEK_END);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6165
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6166 if (status == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6167 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6168 off_t eof_pos = rep->tell ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6169
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6170 if (origin == SEEK_CUR)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6171 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6172 // Move back to original position, otherwise we will be seeking
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6173 // from the end of file which is probably not the original
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6174 // location.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6175 rep->seek (orig_pos, SEEK_SET);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6176 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6177
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6178 // Attempt to move to desired position; may be outside bounds of
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6179 // existing file.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6180 status = rep->seek (offset, origin);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6181
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6182 if (status == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6183 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6184 // Where are we after moving to desired position?
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6185 off_t desired_pos = rep->tell ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6186
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6187 // I don't think save_pos can be less than zero,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6188 // but we'll check anyway...
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6189 if (desired_pos > eof_pos \|\| desired_pos < 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6190 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6191 // Seek outside bounds of file.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6192 // Failure should leave position unchanged.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6193 rep->seek (orig_pos, SEEK_SET);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6194
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6195 status = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6196 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6197 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6198 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6199 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6200 // Seeking to the desired position failed.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6201 // Move back to original position and return failure status.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6202 rep->seek (orig_pos, SEEK_SET);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6203
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6204 status = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6205 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6206 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6207 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6208
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6209 return status;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6210 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6211
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6212 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6213 stream::seek (const octave_value& tc_offset,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6214 const octave_value& tc_origin)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6215 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6216 int retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6217
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6218 // FIXME: should we have octave_value methods that handle off_t explicitly?
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6219 octave_int64 val = tc_offset.xint64_scalar_value ("fseek: invalid value for offset");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6220 off_t xoffset = val.value ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6221
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6222 int conv_err = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6223
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6224 int origin = SEEK_SET;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6225
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6226 if (tc_origin.is_string ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6227 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6228 std::string xorigin = tc_origin.string_value ("fseek: invalid value for origin");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6229
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6230 if (xorigin == "bof")
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6231 origin = SEEK_SET;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6232 else if (xorigin == "cof")
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6233 origin = SEEK_CUR;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6234 else if (xorigin == "eof")
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6235 origin = SEEK_END;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6236 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6237 conv_err = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6238 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6239 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6240 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6241 int xorigin = convert_to_valid_int (tc_origin, conv_err);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6242
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6243 if (! conv_err)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6244 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6245 if (xorigin == -1)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6246 origin = SEEK_SET;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6247 else if (xorigin == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6248 origin = SEEK_CUR;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6249 else if (xorigin == 1)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6250 origin = SEEK_END;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6251 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6252 conv_err = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6253 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6254 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6255
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6256 if (conv_err)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6257 ::error ("fseek: invalid value for origin");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6258
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6259 retval = seek (xoffset, origin);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6260
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6261 if (retval != 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6262 // Note: error is member fcn from stream, not ::error.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6263 error ("fseek: failed to seek to requested position");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6264
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6265 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6266 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6267
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6268 off_t
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6269 stream::tell (void)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6270 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6271 off_t retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6272
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6273 if (stream_ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6274 retval = rep->tell ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6275
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6276 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6277 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6278
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6279 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6280 stream::rewind (void)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6281 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6282 return seek (0, SEEK_SET);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6283 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6284
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6285 bool
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6286 stream::is_open (void) const
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6287 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6288 bool retval = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6289
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6290 if (stream_ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6291 retval = rep->is_open ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6292
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6293 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6294 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6295
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6296 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6297 stream::close (void)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6298 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6299 if (stream_ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6300 rep->close ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6301 }
3340 585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	6302 }
585a8809fd9b [project @ 1999-11-05 07:02:30 by jwe] jwe parents: 3337 diff changeset	6303
21335 e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6304 // 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	6305
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6306 template <typename T>
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6307 static inline bool
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6308 is_old_NA (T)
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6309 {
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6310 return false;
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6311 }
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6312
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6313 template <>
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6314 inline bool
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6315 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	6316 {
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6317 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	6318 }
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6319
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6320 template <typename T>
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6321 static inline T
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6322 replace_old_NA (T val)
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6323 {
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6324 return val;
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6325 }
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6326
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6327 template <>
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6328 inline double
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6329 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	6330 {
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6331 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	6332 }
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6333
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	6334 template <typename SRC_T, typename DST_T>
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6335 static octave_value
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6336 convert_and_copy (std::list<void *>& input_buf_list,
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6337 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,
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6339 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	6340 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	6341 octave::mach_info::float_format from_flt_fmt)
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6342 {
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6343 typedef typename DST_T::element_type dst_elt_type;
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6344
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6345 DST_T conv (dim_vector (nr, nc));
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6346
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6347 dst_elt_type *conv_data = conv.fortran_vec ();
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6348
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6349 octave_idx_type j = 0;
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6350
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6351 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	6352 it != input_buf_list.end (); it++)
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6353 {
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6354 SRC_T data = static_cast<SRC_T > (*it);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6355
17463 cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6356 if (swap \|\| do_float_fmt_conv)
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6357 {
21335 e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6358 if (do_NA_conv)
17463 cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6359 {
21335 e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6360 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	6361 i++, j++)
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6362 {
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6363 if (swap)
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6364 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	6365 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	6366 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	6367 1, from_flt_fmt,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6368 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	6369
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6370 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	6371
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6372 if (is_old_NA (tmp))
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6373 tmp = replace_old_NA (tmp);
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6374
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6375 conv_data[j] = tmp;
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6376 }
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6377 }
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6378 else
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6379 {
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6380 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	6381 i++, j++)
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6382 {
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6383 if (swap)
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6384 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	6385 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	6386 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	6387 1, from_flt_fmt,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6388 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	6389
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6390 conv_data[j] = data[i];
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6391 }
17463 cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6392 }
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6393 }
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6394 else
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6395 {
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6396 if (do_NA_conv)
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6397 {
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6398 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	6399 i++, j++)
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6400 {
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6401 dst_elt_type tmp (data[i]);
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6402
21335 e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6403 if (is_old_NA (tmp))
e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6404 tmp = replace_old_NA (tmp);
17463 cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6405
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6406 conv_data[j] = tmp;
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6407 }
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6408 }
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6409 else
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6410 {
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6411 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	6412 i++, j++)
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6413 conv_data[j] = data[i];
cc13924a4266 snapshot 3.7.7 John W. Eaton <jwe@octave.org> parents: 17453 diff changeset	6414 }
17453 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
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6417 delete [] data;
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6418 }
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6419
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6420 input_buf_list.clear ();
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6421
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6422 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	6423 conv_data[i] = dst_elt_type (0);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6424
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6425 return conv;
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6426 }
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6427
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6428 typedef octave_value (*conv_fptr)
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6429 (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	6430 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	6431 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	6432 octave::mach_info::float_format from_flt_fmt);
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6433
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6434 #define TABLE_ELT(T, U, V, W) \
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6435 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	6436
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6437 #define FILL_TABLE_ROW(T, V) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6438 TABLE_ELT (T, dt_int8, V, int8NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6439 TABLE_ELT (T, dt_uint8, V, uint8NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6440 TABLE_ELT (T, dt_int16, V, int16NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6441 TABLE_ELT (T, dt_uint16, V, uint16NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6442 TABLE_ELT (T, dt_int32, V, int32NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6443 TABLE_ELT (T, dt_uint32, V, uint32NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6444 TABLE_ELT (T, dt_int64, V, int64NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6445 TABLE_ELT (T, dt_uint64, V, uint64NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6446 TABLE_ELT (T, dt_single, V, FloatNDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6447 TABLE_ELT (T, dt_double, V, NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6448 TABLE_ELT (T, dt_char, V, charNDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6449 TABLE_ELT (T, dt_schar, V, charNDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6450 TABLE_ELT (T, dt_uchar, V, charNDArray); \
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6451 TABLE_ELT (T, dt_logical, V, boolNDArray);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6452
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6453 namespace octave
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6454 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6455 octave_value
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6456 stream::finalize_read (std::list<void *>& input_buf_list,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6457 octave_idx_type input_buf_elts,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6458 octave_idx_type elts_read,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6459 octave_idx_type nr, octave_idx_type nc,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6460 oct_data_conv::data_type input_type,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6461 oct_data_conv::data_type output_type,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6462 mach_info::float_format ffmt)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6463 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6464 octave_value retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6465
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6466 static bool initialized = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6467
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6468 // Table function pointers for return types x read types.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6469
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6470 static conv_fptr conv_fptr_table[oct_data_conv::dt_unknown][14];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6471
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6472 if (! initialized)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6473 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6474 for (int i = 0; i < oct_data_conv::dt_unknown; i++)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6475 for (int j = 0; j < 14; j++)
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23792 diff changeset	6476 conv_fptr_table[i][j] = nullptr;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6477
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6478 FILL_TABLE_ROW (dt_int8, int8_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6479 FILL_TABLE_ROW (dt_uint8, uint8_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6480 FILL_TABLE_ROW (dt_int16, int16_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6481 FILL_TABLE_ROW (dt_uint16, uint16_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6482 FILL_TABLE_ROW (dt_int32, int32_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6483 FILL_TABLE_ROW (dt_uint32, uint32_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6484 FILL_TABLE_ROW (dt_int64, int64_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6485 FILL_TABLE_ROW (dt_uint64, uint64_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6486 FILL_TABLE_ROW (dt_single, float);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6487 FILL_TABLE_ROW (dt_double, double);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6488 FILL_TABLE_ROW (dt_char, char);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6489 FILL_TABLE_ROW (dt_schar, signed char);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6490 FILL_TABLE_ROW (dt_uchar, unsigned char);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6491 FILL_TABLE_ROW (dt_logical, bool);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6492
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6493 initialized = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6494 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6495
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6496 bool swap = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6497
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6498 if (ffmt == mach_info::flt_fmt_unknown)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6499 ffmt = float_format ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6500
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6501 if (mach_info::words_big_endian ())
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6502 swap = (ffmt == mach_info::flt_fmt_ieee_little_endian);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6503 else
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6504 swap = (ffmt == mach_info::flt_fmt_ieee_big_endian);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6505
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6506 bool do_float_fmt_conv = ((input_type == oct_data_conv::dt_double
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6507 \|\| input_type == oct_data_conv::dt_single)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6508 && ffmt != float_format ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6509
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6510 bool do_NA_conv = (output_type == oct_data_conv::dt_double);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6511
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6512 switch (output_type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6513 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6514 case oct_data_conv::dt_int8:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6515 case oct_data_conv::dt_uint8:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6516 case oct_data_conv::dt_int16:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6517 case oct_data_conv::dt_uint16:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6518 case oct_data_conv::dt_int32:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6519 case oct_data_conv::dt_uint32:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6520 case oct_data_conv::dt_int64:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6521 case oct_data_conv::dt_uint64:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6522 case oct_data_conv::dt_single:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6523 case oct_data_conv::dt_double:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6524 case oct_data_conv::dt_char:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6525 case oct_data_conv::dt_schar:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6526 case oct_data_conv::dt_uchar:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6527 case oct_data_conv::dt_logical:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6528 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6529 conv_fptr fptr = conv_fptr_table[input_type][output_type];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6530
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6531 retval = fptr (input_buf_list, input_buf_elts, elts_read,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6532 nr, nc, swap, do_float_fmt_conv, do_NA_conv, ffmt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6533 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6534 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6535
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6536 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6537 ::error ("read: invalid type specification");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6538 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6539
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6540 return retval;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6541 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6542
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6543 octave_value
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6544 stream::read (const Array<double>& size, octave_idx_type block_size,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6545 oct_data_conv::data_type input_type,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6546 oct_data_conv::data_type output_type,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6547 octave_idx_type skip, mach_info::float_format ffmt,
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6548 octave_idx_type& count)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6549 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6550 octave_value retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6551
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6552 octave_idx_type nr = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6553 octave_idx_type nc = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6554
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6555 bool one_elt_size_spec = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6556
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6557 if (! stream_ok ())
22996 36df0e0072a5 distinguish elements vs. bytes in fread (bug #49699) John W. Eaton <jwe@octave.org> parents: 22407 diff changeset	6558 return retval;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6559
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6560 // FIXME: we may eventually want to make this extensible.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6561
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6562 // FIXME: we need a better way to ensure that this
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6563 // numbering stays consistent with the order of the elements in the
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6564 // data_type enum in the oct_data_conv class.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6565
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6566 // Expose this in a future version?
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6567 size_t char_count = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6568
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6569 ptrdiff_t tmp_count = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6570
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6571 try
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6572 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6573 get_size (size, nr, nc, one_elt_size_spec, "fread");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6574 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6575 catch (const execution_exception&)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6576 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6577 invalid_operation ("fread", "reading");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6578
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6579 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6580 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6581
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6582 if (one_elt_size_spec)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6583 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6584 // If NR == 0, Matlab returns [](0x0).
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6585
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6586 // If NR > 0, the result will be a column vector with the given
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6587 // number of rows.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6588
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6589 // If NR < 0, then we have Inf and the result will be a column
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6590 // vector but we have to wait to see how big NR will be.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6591
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6592 if (nr == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6593 nr = nc = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6594 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6595 nc = 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6596 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6597 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6598 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6599 // Matlab returns [] even if there are two elements in the size
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6600 // specification and one is nonzero.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6601
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6602 // If NC < 0 we have [NR, Inf] and we'll wait to decide how big NC
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6603 // should be.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6604
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6605 if (nr == 0 \|\| nc == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6606 nr = nc = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6607 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6608
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6609 // FIXME: Ensure that this does not overflow.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6610 // Maybe try comparing nr * nc computed in double with
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6611 // std::numeric_limits<octave_idx_type>::max ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6612 octave_idx_type elts_to_read = nr * nc;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6613
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6614 bool read_to_eof = elts_to_read < 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6615
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6616 octave_idx_type input_buf_elts = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6617
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6618 if (skip == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6619 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6620 if (read_to_eof)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6621 input_buf_elts = 1024 * 1024;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6622 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6623 input_buf_elts = elts_to_read;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6624 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6625 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6626 input_buf_elts = block_size;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6627
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6628 octave_idx_type input_elt_size
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6629 = oct_data_conv::data_type_size (input_type);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6630
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6631 ptrdiff_t input_buf_size
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6632 = static_cast<ptrdiff_t> (input_buf_elts) * input_elt_size;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6633
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6634 assert (input_buf_size >= 0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6635
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6636 // Must also work and return correct type object
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6637 // for 0 elements to read.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6638 std::istream *isp = input_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6639
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6640 if (! isp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6641 error ("fread: invalid input stream");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6642 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6643 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6644 std::istream& is = *isp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6645
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6646 std::list <void *> input_buf_list;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6647
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6648 while (is && ! is.eof ()
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6649 && (read_to_eof \|\| tmp_count < elts_to_read))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6650 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6651 if (! read_to_eof)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6652 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6653 octave_idx_type remaining_elts = elts_to_read - tmp_count;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6654
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6655 if (remaining_elts < input_buf_elts)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6656 input_buf_size = remaining_elts * input_elt_size;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6657 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6658
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6659 char *input_buf = new char [input_buf_size];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6660
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6661 is.read (input_buf, input_buf_size);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6662
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6663 size_t gcount = is.gcount ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6664
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6665 char_count += gcount;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6666
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6667 octave_idx_type nel = gcount / input_elt_size;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6668
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6669 tmp_count += nel;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6670
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6671 input_buf_list.push_back (input_buf);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6672
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6673 if (is && skip != 0 && nel == block_size)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6674 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6675 // Seek to skip.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6676 // If skip would move past EOF, position at EOF.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6677
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6678 off_t orig_pos = tell ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6679
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6680 seek (0, SEEK_END);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6681
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6682 off_t eof_pos = tell ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6683
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6684 // Is it possible for this to fail to return us to
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6685 // the original position?
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6686 seek (orig_pos, SEEK_SET);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6687
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6688 off_t remaining = eof_pos - orig_pos;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6689
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6690 if (remaining < skip)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6691 seek (0, SEEK_END);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6692 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6693 seek (skip, SEEK_CUR);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6694
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6695 if (! is)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6696 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6697 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6698 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6699
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6700 if (read_to_eof)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6701 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6702 if (nc < 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6703 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6704 nc = tmp_count / nr;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6705
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6706 if (tmp_count % nr != 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6707 nc++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6708 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6709 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6710 nr = tmp_count;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6711 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6712 else if (tmp_count == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6713 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6714 nr = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6715 nc = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6716 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6717 else if (tmp_count != nr * nc)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6718 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6719 if (tmp_count % nr != 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6720 nc = tmp_count / nr + 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6721 else
22996 36df0e0072a5 distinguish elements vs. bytes in fread (bug #49699) John W. Eaton <jwe@octave.org> parents: 22407 diff changeset	6722 nc = tmp_count / nr;
36df0e0072a5 distinguish elements vs. bytes in fread (bug #49699) John W. Eaton <jwe@octave.org> parents: 22407 diff changeset	6723
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6724 if (tmp_count < nr)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6725 nr = tmp_count;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6726 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6727
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6728 if (tmp_count > std::numeric_limits<octave_idx_type>::max ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6729 error ("fread: number of elements read exceeds max index size");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6730 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6731 count = static_cast<octave_idx_type> (tmp_count);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6732
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6733 retval = finalize_read (input_buf_list, input_buf_elts, count,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6734 nr, nc, input_type, output_type, ffmt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6735 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6736
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6737 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6738 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6739
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6740 octave_idx_type
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6741 stream::write (const octave_value& data, octave_idx_type block_size,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6742 oct_data_conv::data_type output_type,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6743 octave_idx_type skip, mach_info::float_format flt_fmt)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6744 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6745 octave_idx_type retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6746
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6747 if (! stream_ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6748 invalid_operation ("fwrite", "writing");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6749 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6750 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6751 if (flt_fmt == mach_info::flt_fmt_unknown)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6752 flt_fmt = float_format ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6753
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6754 octave_idx_type status = data.write (*this, block_size, output_type,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6755 skip, flt_fmt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6756
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6757 if (status < 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6758 error ("fwrite: write error");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6759 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6760 retval = status;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6761 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6762
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6763 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6764 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6765 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	6766
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	6767 template <typename T, typename V>
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6768 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	6769 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	6770 {
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6771 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	6772
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6773 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	6774
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6775 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	6776 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	6777 }
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6778
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	6779 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	6780 static void
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6781 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	6782 bool swap)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6783 {
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6784 typedef typename V::val_type val_type;
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6785
19739 3fa35defe495 Adjust spacing of static_cast<> calls to follow Octave coding conventions. Rik <rik@octave.org> parents: 19729 diff changeset	6786 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	6787
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6788 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	6789 {
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	6790 // 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	6791 V val (data[i]);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6792
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6793 vt_data[i] = val.value ();
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6794
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6795 if (swap)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6796 swap_bytes<sizeof (val_type)> (&vt_data[i]);
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6797 }
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6798 }
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6799
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	6800 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	6801 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	6802 {
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6803 public:
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6804 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	6805 };
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6806
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	6807 template <typename T>
23534 b6498c088fca maint: Don't write '> >' for declaration of templates that use templates. Rik <rik@octave.org> parents: 23457 diff changeset	6808 class ultimate_element_type<octave_int<T>>
18616 aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6809 {
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6810 public:
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6811 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	6812 };
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6813
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	6814 template <typename T>
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6815 static bool
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6816 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	6817 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	6818 octave::mach_info::float_format flt_fmt)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6819 {
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6820 bool retval = true;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6821
21776 1e81dd035639 Write integers with correct byte order on big-endian systems (bug #47434) Mike Miller <mtmiller@octave.org> parents: 21296 diff changeset	6822 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	6823
21777 d6826b38b29c maint: Periodic merge of stable to default. Mike Miller <mtmiller@octave.org> parents: 21751 21776 diff changeset	6824 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	6825 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	6826 else
21777 d6826b38b29c maint: Periodic merge of stable to default. Mike Miller <mtmiller@octave.org> parents: 21751 21776 diff changeset	6827 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	6828
c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	6829 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	6830
18616 aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6831 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	6832
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6833 switch (output_type)
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6834 {
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6835 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	6836 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	6837 break;
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6838
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6839 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	6840 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	6841 break;
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6842
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6843 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	6844 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	6845 break;
aa861a98d84d fwrite: don't convert to octave_int for char output types John W. Eaton <jwe@octave.org> parents: 18518 diff changeset	6846
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6847 case oct_data_conv::dt_int8:
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6848 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	6849 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6850
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6851 case oct_data_conv::dt_uint8:
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6852 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	6853 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6854
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6855 case oct_data_conv::dt_int16:
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6856 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	6857 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6858
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6859 case oct_data_conv::dt_uint16:
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6860 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	6861 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6862
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6863 case oct_data_conv::dt_int32:
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6864 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	6865 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6866
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6867 case oct_data_conv::dt_uint32:
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6868 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	6869 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6870
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6871 case oct_data_conv::dt_int64:
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6872 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	6873 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6874
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6875 case oct_data_conv::dt_uint64:
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6876 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	6877 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6878
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6879 case oct_data_conv::dt_single:
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6880 {
19739 3fa35defe495 Adjust spacing of static_cast<> calls to follow Octave coding conventions. Rik <rik@octave.org> parents: 19729 diff changeset	6881 float vt_data = static_cast<float > (conv_data);
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6882
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6883 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	6884 {
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6885 vt_data[i] = data[i];
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6886
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6887 if (do_float_conversion)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6888 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	6889 }
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6890 }
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6891 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6892
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6893 case oct_data_conv::dt_double:
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6894 {
19739 3fa35defe495 Adjust spacing of static_cast<> calls to follow Octave coding conventions. Rik <rik@octave.org> parents: 19729 diff changeset	6895 double vt_data = static_cast<double > (conv_data);
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6896
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6897 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	6898 {
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6899 vt_data[i] = data[i];
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6900
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6901 if (do_float_conversion)
6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6902 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	6903 }
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6904 }
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6905 break;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6906
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6907 default:
20938 aac911d8847b choose correct error function in stream classes John W. Eaton <jwe@octave.org> parents: 20931 diff changeset	6908 ::error ("write: invalid type specification");
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6909 }
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6910
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6911 return retval;
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6912 }
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	6913
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6914 namespace octave
17416 6690dba6078a improve efficiency of fwrite John W. Eaton <jwe@octave.org> parents: 17415 diff changeset	6915 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6916 bool
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6917 stream::write_bytes (const void *data, size_t nbytes)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6918 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6919 bool status = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6920
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6921 std::ostream *osp = output_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6922
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6923 if (osp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6924 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6925 std::ostream& os = *osp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6926
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6927 if (os)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6928 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6929 os.write (static_cast<const char *> (data), nbytes);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6930
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6931 if (os)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6932 status = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6933 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6934 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6935
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6936 return status;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6937 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6938
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6939 bool
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6940 stream::skip_bytes (size_t skip)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6941 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6942 bool status = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6943
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6944 std::ostream *osp = output_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6945
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6946 if (! osp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6947 return false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6948
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6949 std::ostream& os = *osp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6950
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6951 // Seek to skip when inside bounds of existing file.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6952 // Otherwise, write NUL to skip.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6953 off_t orig_pos = tell ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6954
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6955 seek (0, SEEK_END);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6956
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6957 off_t eof_pos = tell ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6958
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6959 // Is it possible for this to fail to return us to the original position?
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6960 seek (orig_pos, SEEK_SET);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6961
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6962 size_t remaining = eof_pos - orig_pos;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6963
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6964 if (remaining < skip)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6965 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6966 seek (0, SEEK_END);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6967
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6968 // FIXME: probably should try to write larger blocks...
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6969 unsigned char zero = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6970 for (size_t j = 0; j < skip - remaining; j++)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6971 os.write (reinterpret_cast<const char *> (&zero), 1);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6972 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6973 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6974 seek (skip, SEEK_CUR);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6975
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6976 if (os)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6977 status = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6978
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6979 return status;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6980 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6981
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6982 template <typename T>
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6983 octave_idx_type
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6984 stream::write (const Array<T>& data, octave_idx_type block_size,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6985 oct_data_conv::data_type output_type,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6986 octave_idx_type skip,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6987 mach_info::float_format flt_fmt)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6988 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6989 bool swap = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6990
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6991 if (mach_info::words_big_endian ())
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6992 swap = (flt_fmt == mach_info::flt_fmt_ieee_little_endian);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6993 else
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6994 swap = (flt_fmt == mach_info::flt_fmt_ieee_big_endian);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6995
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6996 bool do_data_conversion = (swap \|\| ! is_equivalent_type<T> (output_type)
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6997 \|\| flt_fmt != mach_info::float_format ());
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6998
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6999 octave_idx_type nel = data.numel ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7000
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7001 octave_idx_type chunk_size;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7002
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7003 if (skip != 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7004 chunk_size = block_size;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7005 else if (do_data_conversion)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7006 chunk_size = 1024 * 1024;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7007 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7008 chunk_size = nel;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7009
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7010 octave_idx_type i = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7011
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7012 const T *pdata = data.data ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7013
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7014 while (i < nel)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7015 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7016 if (skip != 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7017 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7018 if (! skip_bytes (skip))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7019 return -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7020 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7021
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7022 octave_idx_type remaining_nel = nel - i;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7023
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7024 if (chunk_size > remaining_nel)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7025 chunk_size = remaining_nel;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7026
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7027 bool status = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7028
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7029 if (do_data_conversion)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7030 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7031 size_t output_size
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7032 = chunk_size * oct_data_conv::data_type_size (output_type);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7033
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7034 OCTAVE_LOCAL_BUFFER (unsigned char, conv_data, output_size);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7035
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7036 status = convert_data (&pdata[i], conv_data, chunk_size,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7037 output_type, flt_fmt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7038
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7039 if (status)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7040 status = write_bytes (conv_data, output_size);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7041 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7042 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7043 status = write_bytes (pdata, sizeof (T) * chunk_size);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7044
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7045 if (! status)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7046 return -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7047
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7048 i += chunk_size;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7049 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7050
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7051 return nel;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7052 }
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	7053
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	7054 #define INSTANTIATE_WRITE(T) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	7055 template \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	7056 octave_idx_type \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7057 stream::write (const Array<T>& data, octave_idx_type block_size, \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7058 oct_data_conv::data_type output_type, \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7059 octave_idx_type skip, \
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	7060 mach_info::float_format flt_fmt)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7061
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7062 INSTANTIATE_WRITE (octave_int8);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7063 INSTANTIATE_WRITE (octave_uint8);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7064 INSTANTIATE_WRITE (octave_int16);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7065 INSTANTIATE_WRITE (octave_uint16);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7066 INSTANTIATE_WRITE (octave_int32);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7067 INSTANTIATE_WRITE (octave_uint32);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7068 INSTANTIATE_WRITE (octave_int64);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7069 INSTANTIATE_WRITE (octave_uint64);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7070 INSTANTIATE_WRITE (int8_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7071 INSTANTIATE_WRITE (uint8_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7072 INSTANTIATE_WRITE (int16_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7073 INSTANTIATE_WRITE (uint16_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7074 INSTANTIATE_WRITE (int32_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7075 INSTANTIATE_WRITE (uint32_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7076 INSTANTIATE_WRITE (int64_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7077 INSTANTIATE_WRITE (uint64_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7078 INSTANTIATE_WRITE (bool);
21354 06d15e4e611a move public data type macros to octave-config.h John W. Eaton <jwe@octave.org> parents: 21335 diff changeset	7079 #if defined (OCTAVE_HAVE_OVERLOAD_CHAR_INT8_TYPES)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7080 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	7081 #endif
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7082 INSTANTIATE_WRITE (float);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7083 INSTANTIATE_WRITE (double);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7084
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7085 octave_value
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7086 stream::scanf (const std::string& fmt, const Array<double>& size,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7087 octave_idx_type& count, const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7088 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7089 octave_value retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7090
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7091 if (stream_ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7092 retval = rep->scanf (fmt, size, count, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7093
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7094 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7095 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7096
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7097 octave_value
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7098 stream::scanf (const octave_value& fmt, const Array<double>& size,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7099 octave_idx_type& count, const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7100 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7101 octave_value retval = Matrix ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7102
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7103 if (fmt.is_string ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7104 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7105 std::string sfmt = fmt.string_value ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7106
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7107 if (fmt.is_sq_string ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7108 sfmt = do_string_escapes (sfmt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7109
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7110 retval = scanf (sfmt, size, count, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7111 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7112 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7113 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7114 // Note: error is member fcn from stream, not ::error.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7115 error (who + ": format must be a string");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7116 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7117
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7118 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7119 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7120
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7121 octave_value_list
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7122 stream::oscanf (const std::string& fmt, const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7123 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7124 octave_value_list retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7125
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7126 if (stream_ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7127 retval = rep->oscanf (fmt, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7128
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7129 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7130 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7131
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7132 octave_value_list
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7133 stream::oscanf (const octave_value& fmt, const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7134 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7135 octave_value_list retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7136
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7137 if (fmt.is_string ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7138 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7139 std::string sfmt = fmt.string_value ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7140
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7141 if (fmt.is_sq_string ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7142 sfmt = do_string_escapes (sfmt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7143
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7144 retval = oscanf (sfmt, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7145 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7146 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7147 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7148 // Note: error is member fcn from stream, not ::error.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7149 error (who + ": format must be a string");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7150 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7151
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7152 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7153 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7154
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7155 octave_value
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7156 stream::textscan (const std::string& fmt, octave_idx_type ntimes,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7157 const octave_value_list& options,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7158 const std::string& who, octave_idx_type& count)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7159 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7160 return (stream_ok ()
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7161 ? rep->do_textscan (fmt, ntimes, options, who, count)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7162 : octave_value ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7163 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7164
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7165 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7166 stream::printf (const std::string& fmt, const octave_value_list& args,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7167 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7168 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7169 int retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7170
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7171 if (stream_ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7172 retval = rep->printf (fmt, args, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7173
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7174 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7175 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7176
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7177 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7178 stream::printf (const octave_value& fmt, const octave_value_list& args,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7179 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7180 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7181 int retval = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7182
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7183 if (fmt.is_string ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7184 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7185 std::string sfmt = fmt.string_value ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7186
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7187 if (fmt.is_sq_string ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7188 sfmt = do_string_escapes (sfmt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7189
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7190 retval = printf (sfmt, args, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7191 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7192 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7193 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7194 // Note: error is member fcn from stream, not ::error.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7195 error (who + ": format must be a string");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7196 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7197
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7198 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7199 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7200
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7201 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7202 stream::puts (const std::string& s, const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7203 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7204 int retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7205
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7206 if (stream_ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7207 retval = rep->puts (s, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7208
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7209 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7210 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7211
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7212 // FIXME: maybe this should work for string arrays too.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7213
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7214 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7215 stream::puts (const octave_value& tc_s, const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7216 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7217 int retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7218
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7219 if (tc_s.is_string ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7220 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7221 std::string s = tc_s.string_value ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7222 retval = puts (s, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7223 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7224 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7225 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7226 // Note: error is member fcn from stream, not ::error.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7227 error (who + ": argument must be a string");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7228 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7229
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7230 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7231 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7232
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7233 bool
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7234 stream::eof (void) const
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7235 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7236 int retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7237
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7238 if (stream_ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7239 retval = rep->eof ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7240
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7241 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7242 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7243
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7244 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7245 stream::error (bool clear, int& err_num)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7246 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7247 std::string retval = "invalid stream object";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7248
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7249 if (stream_ok (false))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7250 retval = rep->error (clear, err_num);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7251
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7252 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7253 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7254
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7255 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7256 stream::name (void) const
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7257 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7258 std::string retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7259
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7260 if (stream_ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7261 retval = rep->name ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7262
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7263 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7264 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7265
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7266 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7267 stream::mode (void) const
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7268 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7269 int retval = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7270
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7271 if (stream_ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7272 retval = rep->mode ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7273
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7274 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7275 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7276
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	7277 mach_info::float_format
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7278 stream::float_format (void) const
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7279 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	7280 mach_info::float_format retval = mach_info::flt_fmt_unknown;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7281
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7282 if (stream_ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7283 retval = rep->float_format ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7284
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7285 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7286 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7287
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7288 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7289 stream::mode_as_string (int mode)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7290 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7291 std::string retval = "???";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7292 std::ios::openmode in_mode = static_cast<std::ios::openmode> (mode);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7293
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7294 if (in_mode == std::ios::in)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7295 retval = "r";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7296 else if (in_mode == std::ios::out
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7297 \|\| in_mode == (std::ios::out \| std::ios::trunc))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7298 retval = "w";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7299 else if (in_mode == (std::ios::out \| std::ios::app))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7300 retval = "a";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7301 else if (in_mode == (std::ios::in \| std::ios::out))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7302 retval = "r+";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7303 else if (in_mode == (std::ios::in \| std::ios::out \| std::ios::trunc))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7304 retval = "w+";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7305 else if (in_mode == (std::ios::in \| std::ios::out \| std::ios::ate))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7306 retval = "a+";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7307 else if (in_mode == (std::ios::in \| std::ios::binary))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7308 retval = "rb";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7309 else if (in_mode == (std::ios::out \| std::ios::binary)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7310 \|\| in_mode == (std::ios::out \| std::ios::trunc \| std::ios::binary))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7311 retval = "wb";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7312 else if (in_mode == (std::ios::out \| std::ios::app \| std::ios::binary))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7313 retval = "ab";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7314 else if (in_mode == (std::ios::in \| std::ios::out \| std::ios::binary))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7315 retval = "r+b";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7316 else if (in_mode == (std::ios::in \| std::ios::out \| std::ios::trunc
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7317 \| std::ios::binary))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7318 retval = "w+b";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7319 else if (in_mode == (std::ios::in \| std::ios::out \| std::ios::ate
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7320 \| std::ios::binary))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7321 retval = "a+b";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7322
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7323 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7324 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7325
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7326 stream_list::stream_list (interpreter&)
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7327 : list (), lookup_cache (list.end ()), m_stdin_file (-1),
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7328 m_stdout_file (-1), m_stderr_file (-1)
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7329 {
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7330 stream stdin_stream = octave_istream::create (&std::cin, "stdin");
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7331
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7332 // This uses octave_stdout (see pager.h), not std::cout so that
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7333 // Octave's standard output stream will pass through the pager.
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7334
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7335 // FIXME: we should be accessing octave_stdout from the interpreter.
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7336
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7337 stream stdout_stream = octave_ostream::create (&octave_stdout, "stdout");
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7338
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7339 stream stderr_stream = octave_ostream::create (&std::cerr, "stderr");
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7340
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7341 m_stdin_file = insert (stdin_stream);
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7342 m_stdout_file = insert (stdout_stream);
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7343 m_stderr_file = insert (stderr_stream);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7344 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7345
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7346 stream_list::~stream_list (void)
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7347 {
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7348 clear ();
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7349 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7350
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7351 int stream_list::insert (stream& os)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7352 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7353 // Insert item with key corresponding to file-descriptor.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7354
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7355 int stream_number = os.file_number ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7356
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7357 if (stream_number == -1)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7358 return stream_number;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7359
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7360 // Should we test for
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7361 //
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7362 // (list.find (stream_number) != list.end ()
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7363 // && list[stream_number].is_open ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7364 //
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7365 // and respond with "error ("internal error: ...")"? It should not
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7366 // happen except for some bug or if the user has opened a stream with
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7367 // an interpreted command, but closed it directly with a system call
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7368 // in an oct-file; then the kernel knows the fd is free, but Octave
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7369 // does not know. If it happens, it should not do harm here to simply
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7370 // overwrite this entry, although the wrong entry might have done harm
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7371 // before.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7372
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7373 if (list.size () >= list.max_size ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7374 ::error ("could not create file id");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7375
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7376 list[stream_number] = os;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7377
6757 c3cd7d14fc5e [project @ 2007-06-25 19:06:42 by jwe] jwe parents: 6708 diff changeset	7378 return stream_number;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7379 }
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
21040 3e7cfee5f786 maint: Rename attributes GCC_ATTR_XXX to OCTAVE_XXX. Rik <rik@octave.org> parents: 21029 diff changeset	7382 OCTAVE_NORETURN static
21029 e3b3bb522d62 maint: Move GCC_ attributes to start of declaration for future compatibility. Rik <rik@octave.org> parents: 21017 diff changeset	7383 void
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	7384 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	7385 {
14cfc9475fe4 [project @ 1999-11-05 08:11:58 by jwe] jwe parents: 3340 diff changeset	7386 if (who.empty ())
14cfc9475fe4 [project @ 1999-11-05 08:11:58 by jwe] jwe parents: 3340 diff changeset	7387 ::error ("invalid stream number = %d", fid);
14cfc9475fe4 [project @ 1999-11-05 08:11:58 by jwe] jwe parents: 3340 diff changeset	7388 else
14cfc9475fe4 [project @ 1999-11-05 08:11:58 by jwe] jwe parents: 3340 diff changeset	7389 ::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	7390 }
14cfc9475fe4 [project @ 1999-11-05 08:11:58 by jwe] jwe parents: 3340 diff changeset	7391
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7392 namespace octave
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7393 {
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7394 stream stream_list::lookup (int fid, const std::string& who) const
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7395 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7396 stream retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7397
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7398 if (fid < 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7399 err_invalid_file_id (fid, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7400
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7401 if (lookup_cache != list.end () && lookup_cache->first == fid)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7402 retval = lookup_cache->second;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7403 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7404 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7405 ostrl_map::const_iterator iter = list.find (fid);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7406
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7407 if (iter == list.end ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7408 err_invalid_file_id (fid, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7409
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7410 retval = iter->second;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7411 lookup_cache = iter;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7412 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7413
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7414 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7415 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7416
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7417 stream stream_list::lookup (const octave_value& fid,
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7418 const std::string& who) const
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7419 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7420 int i = get_file_number (fid);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7421
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7422 return lookup (i, who);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7423 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7424
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7425 int stream_list::remove (int fid, const std::string& who)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7426 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7427 // Can't remove stdin (std::cin), stdout (std::cout), or stderr (std::cerr).
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7428 if (fid < 3)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7429 err_invalid_file_id (fid, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7430
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7431 ostrl_map::iterator iter = list.find (fid);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7432
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7433 if (iter == list.end ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7434 err_invalid_file_id (fid, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7435
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7436 stream os = iter->second;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7437 list.erase (iter);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7438 lookup_cache = list.end ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7439
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7440 // FIXME: is this check redundant?
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7441 if (! os.is_valid ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7442 err_invalid_file_id (fid, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7443
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7444 os.close ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7445
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7446 return 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7447 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7448
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7449 int stream_list::remove (const octave_value& fid, const std::string& who)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7450 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7451 int retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7452
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7453 if (fid.is_string () && fid.string_value () == "all")
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7454 {
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7455 clear (false);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7456
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7457 retval = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7458 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7459 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7460 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7461 int i = get_file_number (fid);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7462
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7463 retval = remove (i, who);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7464 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7465
22837 b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7466 return retval;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7467 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7468
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7469 void stream_list::clear (bool flush)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7470 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7471 if (flush)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7472 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7473 // Flush stdout and stderr.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7474 list[1].flush ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7475 list[2].flush ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7476 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7477
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7478 for (ostrl_map::iterator iter = list.begin (); iter != list.end (); )
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7479 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7480 int fid = iter->first;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7481 if (fid < 3) // Don't delete stdin, stdout, stderr
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7482 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7483 iter++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7484 continue;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7485 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7486
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7487 stream os = iter->second;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7488
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7489 std::string name = os.name ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7490 std::transform (name.begin (), name.end (), name.begin (), tolower);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7491
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7492 // FIXME: This test for gnuplot is hardly foolproof.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7493 if (name.find ("gnuplot") != std::string::npos)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7494 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7495 // Don't close down pipes to gnuplot
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7496 iter++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7497 continue;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7498 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7499
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7500 // Normal file handle. Close and delete from list.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7501 if (os.is_valid ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7502 os.close ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7503
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7504 list.erase (iter++);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7505 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7506
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7507 lookup_cache = list.end ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7508 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7509
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7510 string_vector stream_list::get_info (int fid) const
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7511 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7512 string_vector retval (3);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7513
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7514 if (fid < 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7515 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7516
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7517 stream os;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7518 if (lookup_cache != list.end () && lookup_cache->first == fid)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7519 os = lookup_cache->second;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7520 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7521 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7522 ostrl_map::const_iterator iter = list.find (fid);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7523
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7524 if (iter == list.end ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7525 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7526
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7527 os = iter->second;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7528 lookup_cache = iter;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7529 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7530
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7531 if (! os.is_valid ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7532 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7533
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7534 retval(0) = os.name ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7535 retval(1) = stream::mode_as_string (os.mode ());
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	7536 retval(2) = mach_info::float_format_as_string (os.float_format ());
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7537
22837 b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7538 return retval;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7539 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7540
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7541 string_vector stream_list::get_info (const octave_value& fid) const
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7542 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7543 int conv_err = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7544
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7545 int int_fid = convert_to_valid_int (fid, conv_err);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7546
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7547 if (conv_err)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7548 ::error ("file id must be a file object or integer value");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7549
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7550 return get_info (int_fid);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7551 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7552
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7553 std::string stream_list::list_open_files (void) const
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7554 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7555 std::ostringstream buf;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7556
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7557 buf << "\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7558 << " number mode arch name\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7559 << " ------ ---- ---- ----\n";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7560
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7561 for (const auto& fid_strm : list)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7562 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7563 stream os = fid_strm.second;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7564
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7565 buf << " "
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7566 << std::setiosflags (std::ios::right)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7567 << std::setw (4) << fid_strm.first << " "
19123 c8f03ccdc9ee Align columns for freport() output. Rik <rik@octave.org> parents: 18676 diff changeset	7568 // reset necessary in addition to setiosflags since this is one stmt.
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7569 << std::resetiosflags (std::ios::adjustfield)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7570 << std::setiosflags (std::ios::left)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7571 << std::setw (3)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7572 << stream::mode_as_string (os.mode ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7573 << " "
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7574 << std::setw (9)
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	7575 << mach_info::float_format_as_string (os.float_format ())
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7576 << " "
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7577 << os.name () << "\n";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7578 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7579
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7580 buf << "\n";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7581
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7582 return buf.str ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7583 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7584
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7585 octave_value stream_list::open_file_numbers (void) const
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7586 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7587 Matrix retval (1, list.size (), 0.0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7588
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7589 int num_open = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7590
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7591 for (const auto& fid_strm : list)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7592 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7593 // Skip stdin, stdout, and stderr.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7594 if (fid_strm.first > 2 && fid_strm.second)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7595 retval(0, num_open++) = fid_strm.first;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7596 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7597
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7598 retval.resize ((num_open > 0), num_open);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7599
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7600 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7601 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7602
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7603 int stream_list::get_file_number (const octave_value& fid) const
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7604 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7605 int retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7606
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7607 if (fid.is_string ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7608 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7609 std::string nm = fid.string_value ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7610
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7611 for (const auto& fid_strm : list)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7612 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7613 // stdin, stdout, and stderr are unnamed.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7614 if (fid_strm.first > 2)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7615 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7616 stream os = fid_strm.second;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7617
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7618 if (os && os.name () == nm)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7619 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7620 retval = fid_strm.first;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7621 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7622 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7623 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7624 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7625 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7626 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7627 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7628 int conv_err = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7629
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7630 int int_fid = convert_to_valid_int (fid, conv_err);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7631
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7632 if (conv_err)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7633 ::error ("file id must be a file object, std::string, or integer value");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7634
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7635 retval = int_fid;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7636 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7637
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7638 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7639 }
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7640
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7641 octave_value stream_list::stdin_file (void) const
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7642 {
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7643 return octave_value (m_stdin_file);
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7644 }
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7645
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7646 octave_value stream_list::stdout_file (void) const
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7647 {
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7648 return octave_value (m_stdout_file);
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7649 }
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7650
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7651 octave_value stream_list::stderr_file (void) const
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7652 {
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7653 return octave_value (m_stderr_file);
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7654 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7655 }

Mercurial > octave

annotate libinterp/corefcn/oct-stream.cc @ 24304:ddaee520d342