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

annotate libinterp/corefcn/oct-stream.cc @ 27735:8600f5ea1ec1

use std::shared_ptr to manage stream rep * oct-stream.h, oct-stream.cc (base_stream::m_count): Delete member variable and all uses. (class graphics_toolkit): Use default copy constructor, assignment operator, and destructor. (base_stream::m_rep): Declare as std::shared_ptr<base_stream> instead of using bare pointer.

author	John W. Eaton <jwe@octave.org>
date	Thu, 21 Nov 2019 19:23:20 -0600
parents	8edca821f170
children	61cc648ab034

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
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26364 diff changeset	3 Copyright (C) 1996-2019 John W. Eaton
00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26364 diff changeset	4 Copyright (C) 2015-2019 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
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24505 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
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24505 diff changeset	10 the Free Software Foundation, either version 3 of the License, or
22755 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
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24505 diff changeset	20 <https://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"
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	48 #include "str-vec.h"
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	49
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	50 #include "error.h"
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21040 diff changeset	51 #include "errwarn.h"
3342 d8d3700fb4ab [project @ 1999-11-05 16:55:17 by jwe] jwe parents: 3341 diff changeset	52 #include "input.h"
27301 a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27279 diff changeset	53 #include "interpreter-private.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"
26703 29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26640 diff changeset	58 #include "oct-string.h"
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	59 #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	60 #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	61 #include "ovl.h"
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	62 #include "pager.h"
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	63 #include "utils.h"
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	64
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	65 namespace octave
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	66 {
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	67 // Programming Note: There are two very different error functions used
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	68 // in the stream code. When invoked with "error (...)" the member
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27069 diff changeset	69 // function from stream or base_stream is called. This
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	70 // function sets the error state on the stream AND returns control to
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	71 // the caller. The caller must then return a value at the end of the
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	72 // function. When invoked with "::error (...)" the exception-based
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	73 // error function from error.h is used. This function will throw an
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	74 // exception and not return control to the caller. BE CAREFUL and
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	75 // invoke the correct error function!
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	76
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	77 // Possible values for conv_err:
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	78 //
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	79 // 1 : not a real scalar
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	80 // 2 : value is NaN
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	81 // 3 : value is not an integer
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	82
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	83 static int
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	84 convert_to_valid_int (const octave_value& tc, int& conv_err)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	85 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	86 conv_err = 0;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	87
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	88 int retval = 0;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	89
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	90 double dval = 0.0;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	91
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	92 try
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	93 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	94 dval = tc.double_value ();
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	95 }
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	96 catch (const execution_exception&)
389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	97 {
27474 3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27447 diff changeset	98 octave::interpreter& interp
3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27447 diff changeset	99 = __get_interpreter__ ("convert_to_valid_int");
3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27447 diff changeset	100
3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27447 diff changeset	101 interp.recover_from_exception ();
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	102
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	103 conv_err = 1;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	104 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	105
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	106 if (! conv_err)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	107 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	108 if (! lo_ieee_isnan (dval))
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	109 {
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	110 int ival = math::nint (dval);
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	111
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	112 if (ival == dval)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	113 retval = ival;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	114 else
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	115 conv_err = 3;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	116 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	117 else
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	118 conv_err = 2;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	119 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	120
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	121 return retval;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	122 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	123
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	124 static octave_idx_type
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	125 get_size (double d, const std::string& who)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	126 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	127 octave_idx_type retval = -1;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	128
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	129 if (lo_ieee_isnan (d))
25707 39fd627b2c5d Emit an immediate error if size of an octave_stream object is invalid (bug #54405). Rik <rik@octave.org> parents: 25658 diff changeset	130 ::error ("%s: NaN invalid as size specification", who.c_str ());
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	131
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	132 if (math::isinf (d))
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	133 retval = -1;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	134 else
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	135 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	136 if (d < 0.0)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	137 ::error ("%s: negative value invalid as size specification",
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	138 who.c_str ());
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	139
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	140 if (d > std::numeric_limits<octave_idx_type>::max ())
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	141 ::error ("%s: dimension too large for Octave's index type",
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	142 who.c_str ());
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	143
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	144 retval = math::nint_big (d);
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	145 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	146
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	147 return retval;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	148 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	149
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	150 static void
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	151 get_size (const Array<double>& size,
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	152 octave_idx_type& nr, octave_idx_type& nc,
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	153 bool& one_elt_size_spec, const std::string& who)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	154 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	155 nr = -1;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	156 nc = -1;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	157
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	158 one_elt_size_spec = false;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	159
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	160 double dnr = -1.0;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	161 double dnc = -1.0;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	162
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	163 octave_idx_type sz_len = size.numel ();
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	164
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	165 if (sz_len == 1)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	166 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	167 one_elt_size_spec = true;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	168
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	169 dnr = size(0);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	170
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	171 dnc = (dnr == 0.0) ? 0.0 : 1.0;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	172 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	173 else if (sz_len == 2)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	174 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	175 dnr = size(0);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	176
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	177 if (math::isinf (dnr))
25707 39fd627b2c5d Emit an immediate error if size of an octave_stream object is invalid (bug #54405). Rik <rik@octave.org> parents: 25658 diff changeset	178 ::error ("%s: infinite value invalid as size specification",
39fd627b2c5d Emit an immediate error if size of an octave_stream object is invalid (bug #54405). Rik <rik@octave.org> parents: 25658 diff changeset	179 who.c_str ());
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	180
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	181 dnc = size(1);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	182 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	183 else
25707 39fd627b2c5d Emit an immediate error if size of an octave_stream object is invalid (bug #54405). Rik <rik@octave.org> parents: 25658 diff changeset	184 ::error ("%s: invalid size specification (must be 2-D)", who.c_str ());
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	185
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	186 nr = get_size (dnr, who);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	187
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	188 if (dnc >= 0.0)
25707 39fd627b2c5d Emit an immediate error if size of an octave_stream object is invalid (bug #54405). Rik <rik@octave.org> parents: 25658 diff changeset	189 {
39fd627b2c5d Emit an immediate error if size of an octave_stream object is invalid (bug #54405). Rik <rik@octave.org> parents: 25658 diff changeset	190 nc = get_size (dnc, who);
39fd627b2c5d Emit an immediate error if size of an octave_stream object is invalid (bug #54405). Rik <rik@octave.org> parents: 25658 diff changeset	191
39fd627b2c5d Emit an immediate error if size of an octave_stream object is invalid (bug #54405). Rik <rik@octave.org> parents: 25658 diff changeset	192 // Check for overflow.
25709 02fbbde15308 Fix problems with cset 39fd627b2c5d when octave_idx_type is 64-bit (bug #54405). Rik <rik@octave.org> parents: 25707 diff changeset	193 if (nr > 0 && nc > 0
02fbbde15308 Fix problems with cset 39fd627b2c5d when octave_idx_type is 64-bit (bug #54405). Rik <rik@octave.org> parents: 25707 diff changeset	194 && nc > std::numeric_limits<octave_idx_type>::max () / nr)
02fbbde15308 Fix problems with cset 39fd627b2c5d when octave_idx_type is 64-bit (bug #54405). Rik <rik@octave.org> parents: 25707 diff changeset	195 ::error ("%s: size too large for Octave's index type", who.c_str ());
25707 39fd627b2c5d Emit an immediate error if size of an octave_stream object is invalid (bug #54405). Rik <rik@octave.org> parents: 25658 diff changeset	196 }
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	197 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	198
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	199 static std::string
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	200 expand_char_class (const std::string& s)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	201 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	202 std::string retval;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	203
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	204 size_t len = s.length ();
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	205
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	206 size_t i = 0;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	207
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	208 while (i < len)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	209 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	210 unsigned char c = s[i++];
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	211
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	212 if (c == '-' && i > 1 && i < len
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	213 && ( static_cast<unsigned char> (s[i-2])
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	214 <= static_cast<unsigned char> (s[i])))
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	215 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	216 // Add all characters from the range except the first (we
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	217 // already added it below).
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	218
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	219 for (c = s[i-2]+1; c < s[i]; c++)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	220 retval += c;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	221 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	222 else
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	223 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	224 // Add the character to the class. Only add '-' if it is
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	225 // the last character in the class.
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	226
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	227 if (c != '-' \|\| i == len)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	228 retval += c;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	229 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	230 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	231
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	232 return retval;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	233 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	234
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	235 class
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	236 scanf_format_elt
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	237 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	238 public:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	239
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	240 enum special_conversion
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	241 {
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	242 whitespace_conversion = 1,
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	243 literal_conversion = 2,
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	244 null = 3
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	245 };
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	246
24753 ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	247 scanf_format_elt (const std::string& txt = "", 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	248 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	249 const std::string& ch_class = "")
24753 ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	250 : text (txt), width (w), discard (d), type (typ),
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	251 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	252 { }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	253
24991 831389905438 omit argument name from default copy ctors and assignment operators John W. Eaton <jwe@octave.org> parents: 24753 diff changeset	254 scanf_format_elt (const scanf_format_elt&) = default;
831389905438 omit argument name from default copy ctors and assignment operators John W. Eaton <jwe@octave.org> parents: 24753 diff changeset	255
831389905438 omit argument name from default copy ctors and assignment operators John W. Eaton <jwe@octave.org> parents: 24753 diff changeset	256 scanf_format_elt& operator = (const scanf_format_elt&) = default;
24753 ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	257
ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	258 ~scanf_format_elt (void) = default;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	259
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	260 // The C-style format string.
24753 ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	261 std::string text;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	262
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	263 // The maximum field width.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	264 int width;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	265
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	266 // 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	267 bool discard;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	268
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	269 // 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	270 // 'c', 's', 'p', '%', or '['.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	271 char type;
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 // 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	274 char modifier;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	275
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	276 // 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	277 std::string char_class;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	278 };
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 class
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	281 scanf_format_list
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 public:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	284
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	285 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	286
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	287 // No copying!
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 scanf_format_list&) = delete;
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 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	292
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	293 ~scanf_format_list (void);
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 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	296
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	297 // 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	298 // 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	299 // 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	300 // last conversion.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	301
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	302 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	303
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	304 const scanf_format_elt * first (void)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	305 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	306 curr_idx = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	307 return current ();
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	308 }
d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	309
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	310 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	311 {
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23792 diff changeset	312 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	313 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	314
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	315 const scanf_format_elt * next (bool cycle = true)
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	316 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	317 static scanf_format_elt dummy
24753 ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	318 ("", 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	319
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	320 curr_idx++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	321
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	322 if (curr_idx >= length ())
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 if (cycle)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	325 curr_idx = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	326 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	327 return &dummy;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	328 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	329
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	330 return current ();
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	331 }
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	332
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	333 void printme (void) const;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	334
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	335 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	336
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	337 operator bool () const { return ok (); }
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 all_character_conversions (void);
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 bool all_numeric_conversions (void);
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 private:
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 // 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	346 // invalid conversions have been found.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	347 octave_idx_type nconv;
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 // Index to current element;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	350 size_t curr_idx;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	351
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	352 // List of format elements.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	353 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	354
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	355 // Temporary buffer.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	356 std::ostringstream buf;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	357
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	358 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	359 const std::string& char_class = "");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	360
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	361 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	362 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	363 char& modifier);
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 int finish_conversion (const std::string& s, size_t& i, size_t n,
26500 d76f9e42290a oct-stream.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26415 diff changeset	366 int width, bool discard, char& type,
23059 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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	370 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	371 : 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	372 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	373 size_t n = s.length ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	374
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	375 size_t i = 0;
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 int width = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	378 bool discard = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	379 char modifier = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	380 char type = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	381
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	382 bool have_more = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	383
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	384 while (i < n)
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 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 if (s[i] == '%')
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 // Process percent-escape conversion type.
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 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	393
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	394 have_more = (buf.tellp () != 0);
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 else if (isspace (s[i]))
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 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	399
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	400 width = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	401 discard = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	402 modifier = '\0';
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	403 buf << ' ';
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	404
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	405 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	406 ; // skip whitespace
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	407
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	408 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	409
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	410 have_more = false;
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 else
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 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	415
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	416 width = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	417 discard = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	418 modifier = '\0';
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 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	421 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	422
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	423 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	424
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	425 have_more = false;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	428 if (nconv < 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	429 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	430 have_more = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	431 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	432 }
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	435 if (have_more)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	436 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	437
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	438 buf.clear ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	439 buf.str ("");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	440 }
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 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	443 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	444 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	445
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	446 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	447 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	448 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	449 delete elt;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	450 }
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	453 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	454 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	455 char modifier,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	456 const std::string& char_class)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	457 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	458 std::string text = buf.str ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	459
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	460 if (! text.empty ())
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 scanf_format_elt *elt
24753 ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	463 = new scanf_format_elt (text, width, discard, type,
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	464 modifier, char_class);
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 fmt_elts.push_back (elt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	467 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	468
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	469 buf.clear ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	470 buf.str ("");
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 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	474 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	475 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	476 char& type, char& modifier)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	477 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	478 width = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	479 discard = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	480 modifier = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	481 type = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	482
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	483 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	484
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	485 bool have_width = false;
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 while (i < n)
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 switch (s[i])
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 case '*':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	492 if (discard)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	493 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	494 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	495 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	496 discard = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	497 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	498 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	499 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	500
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	501 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	502 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	503 if (have_width)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	504 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	505 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	506 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	507 char c = s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	508 width = 10 * width + c - '0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	509 have_width = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	510 buf << c;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	511 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	512 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	513 c = s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	514 width = 10 * width + c - '0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	515 buf << c;
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 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	518 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	519
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	520 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	521 if (modifier != '\0')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	522 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	523 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	524 modifier = s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	525 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	526
27385 9a59876c1c4c accept 'X' as scanf conversion specifier (bug #56869) Mike Miller <mtmiller@octave.org> parents: 27382 diff changeset	527 // We accept X for compatibility with undocumented Matlab behavior.
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	528 case 'd': case 'i': case 'o': case 'u': case 'x':
27385 9a59876c1c4c accept 'X' as scanf conversion specifier (bug #56869) Mike Miller <mtmiller@octave.org> parents: 27382 diff changeset	529 case 'X':
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	530 if (modifier == 'L')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	531 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	532 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	533 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	534 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	535 goto fini;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	536
27382 9354d33dfbc4 accept 'E' and 'G' as scanf conversion specifiers (bug #56869) John W. Eaton <jwe@octave.org> parents: 27301 diff changeset	537 // We accept E and G for compatibility with undocumented
9354d33dfbc4 accept 'E' and 'G' as scanf conversion specifiers (bug #56869) John W. Eaton <jwe@octave.org> parents: 27301 diff changeset	538 // Matlab behavior.
23059 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':
27382 9354d33dfbc4 accept 'E' and 'G' as scanf conversion specifiers (bug #56869) John W. Eaton <jwe@octave.org> parents: 27301 diff changeset	540 case 'E': case 'G':
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	541 if (modifier == 'h')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	542 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	543 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	544 break;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	547 // 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	548 buf << 'l';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	549
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	550 goto fini;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	551
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	552 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	553 if (modifier != '\0')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	554 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	555 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	556 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	557 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	558 goto fini;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	559
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	560 fini:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	561 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	562 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	563 type, modifier) == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	564 return;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	565 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	566 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	567
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	568 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	569 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	570 break;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	573 if (nconv < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	574 break;
23059 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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	577 nconv = -1;
21477 4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	578 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	579
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	580 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	581 scanf_format_list::finish_conversion (const std::string& s, size_t& i,
26500 d76f9e42290a oct-stream.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26415 diff changeset	582 size_t n, int width, bool discard,
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	583 char& type, char modifier)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	584 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	585 int retval = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	586
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	587 std::string char_class;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	588
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	589 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	590 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	591
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	592 if (s[i] == '%')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	593 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	594 type = '%';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	595 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	596 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	597 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	598 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	599 type = s[i];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	600
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	601 if (s[i] == '[')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	602 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	603 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	604
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	605 if (i < n)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	606 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	607 beg_idx = i;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	608
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	609 if (s[i] == '^')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	610 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	611 type = '^';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	612 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	613
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	614 if (i < n)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	615 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	616 beg_idx = i;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	617
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	618 if (s[i] == ']')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	619 buf << s[i++];
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 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	622 else if (s[i] == ']')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	623 buf << s[i++];
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	626 while (i < n && s[i] != ']')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	627 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	628
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	629 if (i < n && s[i] == ']')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	630 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	631 end_idx = i-1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	632 buf << s[i++];
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	635 if (s[i-1] != ']')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	636 retval = nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	637 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	638 else
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	639 buf << s[i++];
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	640
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	641 nconv++;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	644 if (nconv >= 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	645 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	646 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	647 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	648 end_idx - beg_idx + 1));
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	649
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	650 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	651 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	652
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	653 return retval;
21477 4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	654 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	655
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	656 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	657 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	658 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	659 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	660
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	661 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	662 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	663 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	664
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	665 std::cerr
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	666 << "width: " << elt->width << "\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	667 << "discard: " << elt->discard << "\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	668 << "type: ";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	669
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	670 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	671 std::cerr << "literal text\n";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	672 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	673 std::cerr << "whitespace\n";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	674 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	675 std::cerr << elt->type << "\n";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	676
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	677 std::cerr
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	678 << "modifier: " << elt->modifier << "\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	679 << "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	680 << "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	681 }
21477 4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	682 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	683
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	684 bool
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	685 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	686 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	687 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	688
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	689 if (n > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	690 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	691 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	692 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	693 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	694
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	695 switch (elt->type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	696 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	697 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	698 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	699 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	700 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	701
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	702 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	703 return false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	704 break;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	708 return true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	709 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	710 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	711 return false;
21477 4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	712 }
4fc04d04dd9c make printf and scanf format element and list objects private John W. Eaton <jwe@octave.org> parents: 21475 diff changeset	713
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	714 bool
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	715 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	716 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	717 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	718
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	719 if (n > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	720 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	721 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	722 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	723 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	724
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	725 switch (elt->type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	726 {
27385 9a59876c1c4c accept 'X' as scanf conversion specifier (bug #56869) Mike Miller <mtmiller@octave.org> parents: 27382 diff changeset	727 case 'd': case 'i': case 'o': case 'u': case 'x': case 'X':
27382 9354d33dfbc4 accept 'E' and 'G' as scanf conversion specifiers (bug #56869) John W. Eaton <jwe@octave.org> parents: 27301 diff changeset	728 case 'e': case 'f': case 'g': case 'E': case 'G':
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	729 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	730
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	731 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	732 return false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	733 break;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	737 return true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	738 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	739 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	740 return false;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	743 class
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	744 printf_format_elt
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	745 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	746 public:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	747
24753 ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	748 printf_format_elt (const std::string& txt = "", 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	749 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	750 char typ = '\0', char mod = '\0')
24753 ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	751 : text (txt), args (n), fw (w), prec (p), flags (f),
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	752 type (typ), modifier (mod)
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
24991 831389905438 omit argument name from default copy ctors and assignment operators John W. Eaton <jwe@octave.org> parents: 24753 diff changeset	755 printf_format_elt (const printf_format_elt&) = default;
831389905438 omit argument name from default copy ctors and assignment operators John W. Eaton <jwe@octave.org> parents: 24753 diff changeset	756
831389905438 omit argument name from default copy ctors and assignment operators John W. Eaton <jwe@octave.org> parents: 24753 diff changeset	757 printf_format_elt& operator = (const printf_format_elt&) = default;
24753 ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	758
ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	759 ~printf_format_elt (void) = default;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	760
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	761 // The C-style format string.
24753 ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	762 std::string text;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	763
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	764 // 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	765 int args;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	766
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	767 // Field width.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	768 int fw;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	769
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	770 // Precision.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	771 int prec;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	772
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	773 // Flags -- '-', '+', ' ', '0', or '#'.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	774 std::string flags;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	775
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	776 // 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	777 // '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	778 char type;
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 // 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	781 char modifier;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	784 class
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	785 printf_format_list
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	786 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	787 public:
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 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	790
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	791 // No copying!
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	792
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	793 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	794
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	795 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	796
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	797 ~printf_format_list (void);
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 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	800
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	801 const printf_format_elt * first (void)
4223 5ebaf7eee36e [project @ 2002-12-17 23:54:34 by jwe] jwe parents: 4153 diff changeset	802 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	803 curr_idx = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	804 return current ();
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	805 }
b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	806
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	807 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	808 {
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23792 diff changeset	809 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	810 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	811
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	812 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	813
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	814 const printf_format_elt * next (bool cycle = true)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	815 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	816 curr_idx++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	817
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	818 if (curr_idx >= length ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	819 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	820 if (cycle)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	821 curr_idx = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	822 else
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23792 diff changeset	823 return nullptr;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	824 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	825
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	826 return current ();
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	827 }
e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	828
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	829 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	830
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	831 void printme (void) const;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	832
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	833 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	834
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	835 operator bool () const { return ok (); }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	836
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	837 private:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	838
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	839 // 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	840 // invalid conversions have been found.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	841 octave_idx_type nconv;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	842
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	843 // Index to current element;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	844 size_t curr_idx;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	845
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	846 // List of format elements.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	847 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	848
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	849 // Temporary buffer.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	850 std::ostringstream buf;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	851
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	852 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	853 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	854
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	855 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	856 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	857 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	858
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	859 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	860 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	861 char modifier, char& type);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	862 };
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	863
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	864 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	865 : 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	866 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	867 size_t n = s.length ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	868
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	869 size_t i = 0;
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 int args = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	872 std::string flags;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	873 int fw = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	874 int prec = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	875 char modifier = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	876 char type = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	877
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	878 bool have_more = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	879 bool empty_buf = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	880
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	881 if (n == 0)
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 printf_format_elt *elt
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	884 = 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	885
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	886 fmt_elts.push_back (elt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	887 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	888 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	889 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	890 while (i < n)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	891 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	892 have_more = true;
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 empty_buf = (buf.tellp () == 0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	895
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	896 switch (s[i])
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	897 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	898 case '%':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	899 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	900 if (empty_buf)
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 process_conversion (s, i, n, args, flags, fw, prec,
26500 d76f9e42290a oct-stream.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26415 diff changeset	903 modifier, type);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	904
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	905 // 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	906 // 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	907 // 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	908 // 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	909 // last trip through the loop.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	910
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	911 have_more = (buf.tellp () != 0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	912 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	913 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	914 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	915 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	916 break;
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 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	919 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	920 args = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	921 flags = "";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	922 fw = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	923 prec = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	924 modifier = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	925 type = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	926 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	927 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	928 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	929 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	930
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	931 if (nconv < 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	932 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	933 have_more = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	934 break;
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 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	937
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	938 if (have_more)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	939 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	940
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	941 buf.clear ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	942 buf.str ("");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	943 }
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	946 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	947 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	948 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	949
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	950 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	951 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	952 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	953 delete elt;
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 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	956
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	957 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	958 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	959 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	960 char modifier)
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 std::string text = buf.str ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	963
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	964 if (! text.empty ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	965 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	966 printf_format_elt *elt
24753 ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	967 = new printf_format_elt (text, args, fw, prec, flags,
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	968 type, modifier);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	969
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	970 fmt_elts.push_back (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 buf.clear ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	974 buf.str ("");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	975 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	976
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	977 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	978 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	979 size_t n, int& args,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	980 std::string& flags, int& fw,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	981 int& prec, char& modifier,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	982 char& type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	983 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	984 args = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	985 flags = "";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	986 fw = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	987 prec = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	988 modifier = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	989 type = '\0';
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	990
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	991 buf << s[i++];
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 bool nxt = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	994
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	995 while (i < n)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	996 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	997 switch (s[i])
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	998 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	999 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	1000 flags += s[i];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1001 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1002 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1003
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1004 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1005 nxt = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1006 break;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1009 if (nxt)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	1010 break;
23059 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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1013 if (i < n)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1014 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1015 if (s[i] == '*')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1016 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1017 fw = -2;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1018 args++;
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	1019 buf << s[i++];
23059 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 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1022 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1023 if (isdigit (s[i]))
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 int nn = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1026 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	1027 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	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 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	1031 buf << s[i++];
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1032 }
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1035 if (i < n && s[i] == '.')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1036 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1037 // nothing before the . means 0.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1038 if (fw == -1)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1039 fw = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1040
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1041 // . followed by nothing is 0.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1042 prec = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1043
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1044 buf << s[i++];
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 if (i < n)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1047 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1048 if (s[i] == '*')
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 prec = -2;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1051 args++;
21517 e626d8a3427e avoid possible memory leak related to ostringstream objects John W. Eaton <jwe@octave.org> parents: 21503 diff changeset	1052 buf << s[i++];
23059 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 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1055 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1056 if (isdigit (s[i]))
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 int nn = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1059 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	1060 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	1061 }
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 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	1064 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1065 }
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 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1068
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1069 if (i < n)
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 // 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	1072 // 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	1073 // integers.
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 switch (s[i])
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1076 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1077 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	1078 modifier = s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1079 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1080
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1081 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1082 break;
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 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	1088 else
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	1089 nconv = -1;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1090 }
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 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1093 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	1094 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	1095 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	1096 char& type)
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 switch (s[i])
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1099 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1100 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	1101 case 'u': case 'c':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1102 if (modifier == 'L')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1103 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1104 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1105 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1106 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1107 goto fini;
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 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	1110 if (modifier == 'h' \|\| modifier == 'l')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1111 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1112 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1113 break;
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 goto fini;
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 's': case 'p': case '%':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1118 if (modifier != '\0')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1119 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1120 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1121 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1122 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1123 goto fini;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1124
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1125 fini:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1126
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1127 type = s[i];
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 buf << s[i++];
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1130
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1131 if (type != '%' \|\| args != 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1132 nconv++;
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 if (type != '%')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1135 args++;
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 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	1138
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1139 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1140
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1141 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1142 nconv = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1143 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1144 }
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1147 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1148 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	1149 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1150 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	1151
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1152 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	1153 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1154 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	1155
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1156 std::cerr
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1157 << "args: " << elt->args << "\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1158 << "flags: '" << elt->flags << "'\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1159 << "width: " << elt->fw << "\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1160 << "prec: " << elt->prec << "\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1161 << "type: '" << elt->type << "'\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1162 << "modifier: '" << elt->modifier << "'\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1163 << "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	1164 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	1165 }
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1166
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1167 // Calculate x^n. Used for ...e+nn so that, for example, 1e2 is
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1168 // exactly 100 and 5e-1 is 1/2
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1169
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1170 static double
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1171 pown (double x, unsigned int n)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1172 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1173 double retval = 1;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1174
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1175 for (unsigned int d = n; d; d >>= 1)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1176 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1177 if (d & 1)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1178 retval *= x;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1179 x *= x;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1180 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1181
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1182 return retval;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1183 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1184
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1185 static Cell
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1186 init_inf_nan (void)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1187 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1188 Cell retval (dim_vector (1, 2));
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1189
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1190 retval(0) = Cell (octave_value ("inf"));
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1191 retval(1) = Cell (octave_value ("nan"));
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1192
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1193 return retval;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1194 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	1195
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1196 // 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	1197 // by single-character delimiters.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1198 //
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1199 // 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	1200 // 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	1201 // textscan workload.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1202 //
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1203 // 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	1204 // 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	1205 // 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	1206 // 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	1207 // 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	1208
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1209 class
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1210 delimited_stream
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1211 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1212 public:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1213
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1214 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	1215 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	1216
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1217 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	1218
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1219 // No copying!
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1220
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1221 delimited_stream (const delimited_stream&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1222
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1223 delimited_stream& operator = (const delimited_stream&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1224
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1225 ~delimited_stream (void);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1226
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1227 // 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	1228 // 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	1229 void field_done (void)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1230 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1231 if (idx >= last)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1232 refresh_buf ();
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1235 // 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	1236 // 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	1237 int refresh_buf (void);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1238
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1239 // 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	1240 // a delimiter has been reached.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1241 int get (void)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1242 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1243 if (delimited)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1244 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	1245 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1246 return get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1247 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1248
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1249 // 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	1250 int get_undelim (void);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1251
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1252 // Read character that will be got by the next get.
27424 17b915ad4b73 Fix error with %q format and textscan (bug #56917). Rik <rik@octave.org> parents: 27385 diff changeset	1253 // FIXME: This will not set EOF if delimited stream is at EOF and a peek
17b915ad4b73 Fix error with %q format and textscan (bug #56917). Rik <rik@octave.org> parents: 27385 diff changeset	1254 // is attempted. This does NOT behave like C++ input stream.
17b915ad4b73 Fix error with %q format and textscan (bug #56917). Rik <rik@octave.org> parents: 27385 diff changeset	1255 // For a compatible peek function, use peek_undelim. See bug #56917.
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1256 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	1257
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1258 // 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	1259 int peek_undelim (void);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1260
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1261 // 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	1262 // 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	1263 // 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	1264 // 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	1265 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	1266
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1267 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	1268
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1269 // int skipline (char delim);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1270
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	1271 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	1272
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1273 // 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	1274 // 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	1275 char * tellg (void) { return idx; }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1276
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1277 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	1278
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1279 bool eof (void)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1280 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1281 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	1282 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1283
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23792 diff changeset	1284 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	1285
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1286 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	1287
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1288 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	1289
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1290 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	1291
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1292 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	1293 = (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	1294 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1295 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	1296 }
22326 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 // 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	1299 // (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	1300
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1301 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	1302
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1303 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	1304
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1305 private:
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 // 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	1308 int bufsize;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1309
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1310 // Stream to read from.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1311 std::istream& i_stream;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1312
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1313 // 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	1314 char *buf;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1315
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1316 // Current read pointer.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1317 char *idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1318
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1319 // 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	1320 // delimited is false).
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1321 char *last;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1322
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1323 // Position after last character in buffer.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1324 char *eob;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1325
27424 17b915ad4b73 Fix error with %q format and textscan (bug #56917). Rik <rik@octave.org> parents: 27385 diff changeset	1326 // True if there is delimiter in the buffer after idx.
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1327 bool delimited;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1328
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1329 // Longest lookahead required.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1330 int longest;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1331
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1332 // Sequence of single-character delimiters.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1333 const std::string delims;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1334
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1335 // 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	1336 std::streampos buf_in_file;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1337
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1338 // 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	1339 char *progress_marker;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1340
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1341 std::ios_base::iostate flags;
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1344 // 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	1345 // 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	1346 // 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	1347
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1348 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	1349 const std::string& delimiters,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1350 int longest_lookahead,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1351 octave_idx_type bsize)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1352 : 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	1353 delims (delimiters),
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1354 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	1355 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1356 buf = new char[bufsize];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1357 eob = buf + bufsize;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1358 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	1359 progress_marker = idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1360 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	1361 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1362
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1363 // 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	1364 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	1365 const delimited_stream& ds)
24177 89167cc74260 Reuse constructor code of delimited stream. Daniel J Sebald <daniel.sebald@ieee.org> parents: 24176 diff changeset	1366 : delimited_stream (is, ds.delims, ds.longest, ds.bufsize)
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	1367 { }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1368
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1369 delimited_stream::~delimited_stream (void)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1370 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1371 // 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	1372 if (! eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1373 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1374 i_stream.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1375 i_stream.seekg (buf_in_file);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1376 i_stream.read (buf, idx - buf);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1377 }
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 delete [] buf;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1380 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1381
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1382 // 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	1383 // if necessary.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1384
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1385 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1386 delimited_stream::get_undelim (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 int retval;
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 setstate (std::ios_base::failbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1392 return std::istream::traits_type::eof ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1393 }
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 if (idx < eob)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1396 retval = *idx++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1397 else
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 refresh_buf ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1400
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1401 if (eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1402 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1403 setstate (std::ios_base::eofbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1404 retval = std::istream::traits_type::eof ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1405 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1406 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1407 retval = *idx++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1408 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1409
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1410 if (idx >= last)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1411 delimited = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1412
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1413 return retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1414 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1415
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1416 // 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	1417 // 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	1418
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1419 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1420 delimited_stream::peek_undelim (void)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1421 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1422 int retval = get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1423 putback ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1424
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1425 return retval;
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1428 // 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	1429 // 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	1430 // 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	1431 // processed.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1432
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1433 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1434 delimited_stream::refresh_buf (void)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1435 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1436 if (eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1437 return std::istream::traits_type::eof ();
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;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1440
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1441 if (eob < idx)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1442 idx = eob;
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 size_t old_remaining = eob - idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1445
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1446 octave_quit (); // allow ctrl-C
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1447
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1448 if (old_remaining > 0)
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 buf_in_file += (idx - buf);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1451 memmove (buf, idx, old_remaining);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1452 }
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	1453 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	1454 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	1455
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1456 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	1457 idx = buf;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1458
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1459 int gcount; // chars read
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1460 if (! i_stream.eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1461 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1462 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	1463 gcount = i_stream.gcount ();
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 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1466 gcount = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1467
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1468 eob = buf + old_remaining + gcount;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1469 last = eob;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1470 if (gcount == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1471 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1472 delimited = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1473
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1474 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	1475 retval = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1476 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1477 // file and buffer are both done.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1478 retval = std::istream::traits_type::eof ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1479 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1480 else
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 delimited = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1483
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1484 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	1485 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1486 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	1487 break;
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1490 if (last < buf)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1491 delimited = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1492
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1493 retval = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1494 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1495
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1496 // 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	1497 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	1498 *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	1499
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1500 return retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1501 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1502
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1503 // 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	1504 // 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	1505 // 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	1506 // 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	1507 // 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	1508
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1509 char *
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1510 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	1511 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1512 char *retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1513
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1514 if (eob - idx > size)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1515 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1516 retval = idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1517 idx += size;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1518 if (idx > last)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1519 delimited = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1520 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1521 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1522 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1523 // 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	1524 // 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	1525 // 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	1526 // 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	1527
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1528 if (eob - prior_tell + size < bufsize)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1529 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1530 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	1531 idx = prior_tell;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1532 refresh_buf ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1533 idx += gap;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1534 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1535 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	1536 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1537 refresh_buf ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1538 }
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 prior_tell = buf;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1541
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1542 if (eob - idx > size)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1543 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1544 retval = idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1545 idx += size;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1546 if (idx > last)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1547 delimited = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1548 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1549 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1550 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1551 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	1552 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1553 retval = idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1554 memset (eob, 0, size + (idx - buf));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1555 idx += size;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1556 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1557 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	1558 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1559 retval = buffer;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1560 // FIXME: read bufsize at a time
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1561 int i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1562 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	1563 *buffer++ = get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1564 if (eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1565 memset (buffer, 0, size - i);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1566 }
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 }
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 return retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1571 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1572
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1573 // 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	1574 // must have length at least 1.
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 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1577 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	1578 {
23812 057a894914df Use C++11 string fcns back() and pop_back() to simplify code. Rik <rik@octave.org> parents: 23807 diff changeset	1579 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	1580 int used = 0;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1581 int ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1582 while ((ch = get_undelim ()) != delim
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1583 && ch != std::istream::traits_type::eof ())
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 out[used++] = ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1586 if (used == len)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1587 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1588 len <<= 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1589 out.resize (len);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1590 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1591 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1592 out.resize (used);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1593 field_done ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1594
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1595 return ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1596 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1597
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1598 // 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	1599
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1600 class
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1601 textscan_format_elt
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1602 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1603 public:
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 enum special_conversion
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	1606 {
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	1607 whitespace_conversion = 1,
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	1608 literal_conversion = 2
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	1609 };
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1610
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1611 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	1612 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	1613 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	1614 : 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	1615 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	1616 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	1617 { }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1618
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1619 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	1620 : 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	1621 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	1622 discard (e.discard), numeric (e.numeric)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1623 { }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1624
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1625 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	1626 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1627 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	1628 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1629 text = e.text;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1630 width = e.width;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1631 prec = e.prec;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1632 bitwidth = e.bitwidth;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1633 discard = e.discard;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1634 type = e.type;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1635 numeric = e.numeric;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1636 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	1637 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1638
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1639 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	1640 }
22326 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 // The C-style format string.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1643 std::string text;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1644
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1645 // The maximum field width.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1646 unsigned int width;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1647
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1648 // 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	1649 // floating point conversion.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1650 int prec;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1651
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1652 // 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	1653 // 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	1654 int bitwidth;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1655
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27172 diff changeset	1656 // The class of characters in a '[' or '^' format.
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1657 std::string char_class;
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 // Type of conversion
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27172 diff changeset	1660 // -- 'd', 'u', 'f', 'n', 's', 'q', 'c', '%', 'C', 'D', '[' or '^'.
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1661 char type;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1662
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1663 // 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	1664 bool discard;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1665
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1666 // 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	1667 bool numeric;
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1670 // The (parsed) sequence of format specifiers.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1671
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1672 class textscan;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1673
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1674 class
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1675 textscan_format_list
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1676 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1677 public:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1678
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1679 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	1680 const std::string& who = "textscan");
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1681 // No copying!
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1682
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1683 textscan_format_list (const textscan_format_list&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1684
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1685 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	1686
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1687 ~textscan_format_list (void);
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 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	1690
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1691 // 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	1692 // 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	1693 // 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	1694 // last conversion.
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 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	1697
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	1698 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	1699 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1700 curr_idx = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1701 return current ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1702 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1703
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	1704 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	1705 {
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23792 diff changeset	1706 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	1707 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1708
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23398 diff changeset	1709 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	1710 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1711 curr_idx++;
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 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	1714 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1715 if (cycle)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1716 curr_idx = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1717 else
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23792 diff changeset	1718 return nullptr;
22326 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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1721 return current ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1722 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1723
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1724 void printme (void) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1725
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1726 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	1727
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23792 diff changeset	1728 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	1729
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1730 // 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	1731 std::string who;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1732
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1733 // 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	1734 bool set_from_first;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1735
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1736 // 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	1737 bool has_string;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1738
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1739 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	1740
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1741 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	1742
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1743 private:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1744
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1745 // 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	1746 // invalid conversions have been found.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1747 octave_idx_type nconv;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1748
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1749 // Index to current element;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1750 size_t curr_idx;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1751
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1752 // List of format elements.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1753 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	1754
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1755 // 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	1756 std::list<octave_value> output_container;
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 // Temporary buffer.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1759 std::ostringstream buf;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1760
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1761 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	1762 octave_value val_type, bool discard,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1763 char type,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1764 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	1765
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1766 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	1767
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1768 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	1769
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1770 int finish_conversion (const std::string& s, size_t& i, size_t n,
26500 d76f9e42290a oct-stream.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26415 diff changeset	1771 unsigned int width, int prec, int bitwidth,
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1772 octave_value& val_type,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1773 bool discard, char& type);
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1776 // 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	1777 // according to a format.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1778 //
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1779 // The calling sequence is
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1780 //
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1781 // textscan scanner ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1782 // scanner.scan (...);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1783
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1784 class
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1785 OCTINTERP_API
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1786 textscan
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1787 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1788 public:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1789
26706 ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	1790 textscan (const std::string& who_arg = "textscan",
ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	1791 const std::string& encoding = "utf-8");
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1792
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1793 // No copying!
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1794
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1795 textscan (const textscan&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1796
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1797 textscan& operator = (const textscan&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	1798
22868 87e3163f6c87 use c++11 "= default" syntax for declaration of trivial destructors John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	1799 ~textscan (void) = default;
22326 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 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	1802 octave_idx_type ntimes,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1803 const octave_value_list& options,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1804 octave_idx_type& read_count);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1805
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1806 private:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1807
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1808 friend class textscan_format_list;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1809
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1810 // 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	1811 std::string who;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1812
26706 ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	1813 std::string m_encoding;
ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	1814
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1815 std::string buf;
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 // 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	1818 // 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	1819 // 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	1820 // 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	1821
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1822 std::string whitespace_table;
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 // 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	1825 std::string delim_table;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1826
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1827 // String of delimiter characters.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1828 std::string delims;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1829
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1830 Cell comment_style;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1831
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1832 // 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	1833 int comment_len;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1834
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1835 // First character of open comment.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1836 int comment_char;
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 octave_idx_type buffer_size;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1839
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1840 std::string date_locale;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1841
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1842 // 'inf' and 'nan' for formatted_double.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1843 Cell inf_nan;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1844
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1845 // Array of strings of delimiters.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1846 Cell delim_list;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1847
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1848 // Longest delimiter.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1849 int delim_len;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1850
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1851 octave_value empty_value;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1852 std::string exp_chars;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1853 int header_lines;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1854 Cell treat_as_empty;
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 // 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	1857 int treat_as_empty_len;
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 std::string whitespace;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1860
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1861 short eol1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1862 short eol2;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1863 short return_on_error;
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 bool collect_output;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1866 bool multiple_delims_as_one;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1867 bool default_exp;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1868
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1869 octave_idx_type lines;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1870
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1871 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	1872 octave_idx_type ntimes);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1873
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1874 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	1875 textscan_format_list& fmt_list);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1876
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1877 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	1878 std::list<octave_value>& retval,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1879 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	1880
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1881 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	1882 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	1883
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1884 // 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	1885 double read_double (delimited_stream& is,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1886 const textscan_format_elt& fmt) const;
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 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	1889 Complex& val) const;
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 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	1892 std::string& val) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1893
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1894 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	1895 std::string& val) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1896
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1897 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	1898 std::string& val) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1899
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1900 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	1901 std::string& val) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1902
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1903 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	1904 std::string& val);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1905
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1906 // Helper methods.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1907 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	1908 const std::string& ends) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1909
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1910 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	1911 bool case_sensitive = true) const;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1912
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1913 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	1914
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1915 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	1916
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1917 int skip_delim (delimited_stream& is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1918
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1919 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	1920 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1921 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	1922 \|\| delim_table[ch] != '\0');
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1925 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	1926
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1927 // 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	1928 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	1929 };
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 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	1932 const std::string& who_arg)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1933 : 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	1934 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	1935 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1936 size_t n = s.length ();
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 size_t i = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1939
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1940 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	1941 int prec = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1942 int bitwidth = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1943 bool discard = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1944 char type = '\0';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1945
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1946 bool have_more = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1947
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1948 if (s.empty ())
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 buf.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1951 buf.str ("");
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1952
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1953 buf << "%f";
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1954
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1955 bitwidth = 64;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1956 type = 'f';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1957 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	1958 discard, type);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1959 have_more = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1960 set_from_first = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1961 nconv = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1962 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1963 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1964 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1965 set_from_first = false;
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 while (i < n)
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 have_more = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1970
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1971 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	1972 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1973 // Process percent-escape conversion type.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1974
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1975 process_conversion (s, i, n);
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 // 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	1978 // 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	1979 // 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	1980 // 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	1981 // loop.
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 = (buf.tellp () != 0);
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 else if (isspace (s[i]))
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 while (++i < n && isspace (s[i]))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1988 /* skip whitespace */;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1989
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1990 have_more = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1991 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1992 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1993 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1994 type = textscan_format_elt::literal_conversion;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1995
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1996 width = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1997 prec = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1998 bitwidth = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1999 discard = true;
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 && (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	2003 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2004 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	2005 i++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2006 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2007 width++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2008 }
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 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	2011 discard, type);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2012
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2013 have_more = false;
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2016 if (nconv < 0)
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 have_more = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2019 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2020 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2021 }
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 if (have_more)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2025 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	2026
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2027 buf.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2028 buf.str ("");
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2031 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	2032 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2033 size_t n = numel ();
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 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	2036 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2037 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	2038 delete elt;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2039 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2040 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2041
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2042 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2043 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	2044 int bitwidth, octave_value val_type,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2045 bool discard, char type,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2046 const std::string& char_class)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2047 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2048 std::string text = buf.str ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2049
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2050 if (! text.empty ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2051 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2052 textscan_format_elt *elt
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	2053 = 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	2054 char_class);
22326 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 if (! discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2057 output_container.push_back (val_type);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2058
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2059 fmt_elts.push_back (elt);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2060 }
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 buf.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2063 buf.str ("");
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2064 }
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 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2067 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	2068 size_t n)
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 unsigned width = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2071 int prec = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2072 int bitwidth = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2073 bool discard = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2074 octave_value val_type;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2075 char type = '\0';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2076
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2077 buf << s[i++];
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 bool have_width = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2080
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2081 while (i < n)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2082 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2083 switch (s[i])
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2084 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2085 case '*':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2086 if (discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2087 nconv = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2088 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2089 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2090 discard = true;
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 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2094
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2095 case '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	2096 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	2097 if (have_width)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2098 nconv = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2099 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2100 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2101 char c = s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2102 width = width * 10 + c - '0';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2103 have_width = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2104 buf << c;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2105 while (i < n && isdigit (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 c = s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2108 width = width * 10 + c - '0';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2109 buf << c;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2110 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2111
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2112 if (i < n && s[i] == '.')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2113 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2114 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2115 prec = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2116 while (i < n && isdigit (s[i]))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2117 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2118 c = s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2119 prec = prec * 10 + c - '0';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2120 buf << c;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2121 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2122 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2123 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2124 break;
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 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	2127 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2128 bool done = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2129 buf << (type = s[i++]);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2130 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	2131 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2132 if (s[i] == '8')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2133 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2134 bitwidth = 8;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2135 if (type == 'd')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2136 val_type = octave_value (int8NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2137 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2138 val_type = octave_value (uint8NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2139 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2140 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2141 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	2142 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2143 bitwidth = 16;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2144 if (type == 'd')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2145 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	2146 else
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2147 val_type = octave_value (uint16NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2148 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2149 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2150 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2151 else if (s[i] == '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	2152 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2153 done = false; // use default size below
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2154 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2155 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	2156 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2157 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	2158 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2159 bitwidth = 64;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2160 if (type == 'd')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2161 val_type = octave_value (int64NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2162 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2163 val_type = octave_value (uint64NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2164 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2165 buf << s[i++];
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 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2168 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	2169 }
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 else
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2171 done = false;
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 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	2174 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2175 bitwidth = 32;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2176 if (type == 'd')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2177 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	2178 else
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2179 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	2180 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2181 goto fini;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2182 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2183
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2184 case 'f':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2185 buf << (type = s[i++]);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2186 bitwidth = 64;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2187 if (i < n)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2188 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2189 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	2190 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2191 bitwidth = 32;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2192 val_type = octave_value (FloatNDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2193 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2194 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2195 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2196 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	2197 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2198 val_type = octave_value (NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2199 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2200 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2201 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2202 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2203 val_type = octave_value (NDArray ());
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 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2206 val_type = octave_value (NDArray ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2207 goto fini;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2208
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2209 case 'n':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2210 buf << (type = s[i++]);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2211 bitwidth = 64;
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 goto fini;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2214
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2215 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	2216 if (! discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2217 val_type = octave_value (Cell ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2218 buf << (type = s[i++]);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2219 has_string = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2220 goto fini;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2221
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2222 fini:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2223 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2224 if (! have_width)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2225 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2226 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	2227 width = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2228 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2229 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	2230 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2231
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2232 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	2233 discard, type) == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2234 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	2235 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2236 break;
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 default:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2239 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	2240 who.c_str (), s[i]);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2241 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2242
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2243 if (nconv < 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2244 break;
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2247 nconv = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2248 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2249
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2250 // Parse [...] and [^...]
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 // 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	2253 // 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	2254 // 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	2255 // 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	2256 // pattern.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2257 //
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2258 // 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	2259 // 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	2260 // The latter is efficient for [^...] patterns.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2261
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2262 std::string
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2263 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	2264 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2265 int len = pattern.length ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2266 if (len == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2267 return "";
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2268
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2269 std::string retval (256, '\0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2270 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	2271
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2272 int in = 0, out = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2273 unsigned char ch, prev = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2274 bool flip = false;
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 ch = pattern[in];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2277 if (ch == '^')
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 in++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2280 flip = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2281 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2282 mask[pattern[in]] = '\1';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2283 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	2284
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2285 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	2286 bool prev_prev_was_range = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2287 for (; in < len; in++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2288 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2289 bool was_range = false;
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 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2293
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2294 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	2295 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2296 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	2297 if (start_of_range < ch
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2298 && ((isupper (ch) && isupper (start_of_range))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2299 \|\| (islower (ch) && islower (start_of_range))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2300 \|\| (isdigit (ch) && isdigit (start_of_range))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2301 \|\| 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	2302 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2303 was_range = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2304 out--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2305 mask['-']--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2306 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	2307 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2308 if (mask[i] == '\0')
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 mask[i] = '\1';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2311 retval[out++] = i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2312 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2313 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2314 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2315 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2316 if (! was_range)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2317 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2318 if (mask[ch]++ == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2319 retval[out++] = ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2320 else if (ch != '-')
27069 0a62d9a6aa2d Place Octave's warning and error IDs in to the "Octave" namespace (bug #56213). Rik <rik@octave.org> parents: 26706 diff changeset	2321 warning_with_id ("Octave:textscan-pattern",
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2322 "%s: [...] contains two '%c's",
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2323 who.c_str (), ch);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2324
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2325 if (prev == '-' && mask['-'] >= 2)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2326 warning_with_id
27069 0a62d9a6aa2d Place Octave's warning and error IDs in to the "Octave" namespace (bug #56213). Rik <rik@octave.org> parents: 26706 diff changeset	2327 ("Octave:textscan-pattern",
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2328 "%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	2329 who.c_str ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2330 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2331 prev = ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2332 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	2333 prev_was_range = was_range;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2334 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2335
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2336 if (flip) // [^...]
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2337 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2338 out = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2339 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	2340 if (! mask[i])
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2341 retval[out++] = i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2342 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2343
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2344 retval.resize (out);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2345
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2346 return retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2347 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2348
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2349 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2350 textscan_format_list::finish_conversion (const std::string& s, size_t& i,
26500 d76f9e42290a oct-stream.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26415 diff changeset	2351 size_t n, unsigned int width,
d76f9e42290a oct-stream.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26415 diff changeset	2352 int prec, int bitwidth,
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2353 octave_value& val_type, bool discard,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2354 char& type)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2355 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2356 int retval = 0;
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 std::string char_class;
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 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	2361 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	2362
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2363 if (type != '%')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2364 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2365 nconv++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2366 if (type == '[')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2367 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2368 if (i < n)
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 beg_idx = i;
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 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	2373 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2374 type = '^';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2375 buf << s[i++];
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 (i < n)
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 beg_idx = i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2380
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2381 if (s[i] == ']')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2382 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2383 }
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	2384 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2385 else if (s[i] == ']')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2386 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2387 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2388
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2389 while (i < n && s[i] != ']')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2390 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2391
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2392 if (i < n && s[i] == ']')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2393 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2394 end_idx = i-1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2395 buf << s[i++];
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2396 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2397
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2398 if (s[i-1] != ']')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2399 retval = nconv = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2400 }
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 if (nconv >= 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2404 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2405 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	2406 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	2407 end_idx - beg_idx + 1));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2408
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2409 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	2410 char_class);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2411 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2412
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2413 return retval;
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 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2417 textscan_format_list::printme (void) const
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 size_t n = numel ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2420
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2421 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	2422 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2423 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	2424
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2425 std::cerr
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2426 << "width: " << elt->width << "\n"
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2427 << "digits " << elt->prec << "\n"
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2428 << "bitwidth: " << elt->bitwidth << "\n"
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2429 << "discard: " << elt->discard << "\n"
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2430 << "type: ";
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2431
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2432 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	2433 std::cerr << "literal text\n";
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2434 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	2435 std::cerr << "whitespace\n";
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2436 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2437 std::cerr << elt->type << "\n";
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
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27172 diff changeset	2440 << "char_class: '" << undo_string_escapes (elt->char_class) << "'\n"
823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27172 diff changeset	2441 << "text: '" << undo_string_escapes (elt->text) << "'\n\n";
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2442 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2443 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2444
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2445 // 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	2446 // 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	2447
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2448 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2449 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	2450 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2451 // 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	2452 std::string first_line (20, ' ');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2453
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2454 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	2455
23812 057a894914df Use C++11 string fcns back() and pop_back() to simplify code. Rik <rik@octave.org> parents: 23807 diff changeset	2456 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	2457 first_line.pop_back ();
22326 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 std::istringstream strstr (first_line);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2460 delimited_stream ds (strstr, is);
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 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	2463 Complex val;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2464 octave_value val_type;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2465 nconv = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2466 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	2467 int retval = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2468
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2469 // 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	2470 while (! ds.eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2471 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2472 bool already_skipped_delim = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2473 ts.skip_whitespace (ds);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2474 ds.progress_benchmark ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2475 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	2476 if (ds.fail ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2477 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2478 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	2479
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2480 if (ds.eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2481 break;
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 // 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	2484 // return with an error status.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2485 ts.skip_delim (ds);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2486 if (ds.no_progress ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2487 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2488 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	2489 break;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2490 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2491 already_skipped_delim = true;
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 val = ts.empty_value.scalar_value ();
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 (! --max_empty)
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2499 if (val.imag () == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2500 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	2501 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2502 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	2503
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2504 output_container.push_back (val_type);
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 if (! already_skipped_delim)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2507 ts.skip_delim (ds);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2508
26500 d76f9e42290a oct-stream.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26415 diff changeset	2509 if (ds.no_progress ())
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2510 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2511
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2512 nconv++;
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2515 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	2516
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2517 // 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	2518 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	2519 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	2520
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2521 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	2522 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2523
26706 ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	2524 textscan::textscan (const std::string& who_arg, const std::string& encoding)
ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	2525 : who (who_arg), m_encoding (encoding), buf (), whitespace_table (),
ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	2526 delim_table (), delims (), comment_style (), comment_len (0),
ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	2527 comment_char (-2), buffer_size (0), date_locale (),
ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	2528 inf_nan (init_inf_nan ()), empty_value (numeric_limits<double>::NaN ()),
ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	2529 exp_chars ("edED"), header_lines (0), treat_as_empty (),
ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	2530 treat_as_empty_len (0), whitespace (" \b\t"), eol1 ('\r'), eol2 ('\n'),
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2531 return_on_error (1), collect_output (false),
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	2532 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	2533 { }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2534
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2535 octave_value
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2536 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	2537 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	2538 octave_idx_type& count)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2539 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2540 textscan_format_list fmt_list (fmt);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2541
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2542 parse_options (options, fmt_list);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2543
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2544 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	2545
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2546 // 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	2547 // 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	2548 // 32-bit indexing.
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 std::ios::iostate state = isp.rdstate ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2551 isp.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2552 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	2553 isp.setstate (state);
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 return result;
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2558 octave_value
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2559 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	2560 octave_idx_type ntimes)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2561 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2562 octave_value retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2563
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2564 if (fmt_list.num_conversions () == -1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2565 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	2566
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2567 if (fmt_list.num_conversions () == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2568 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	2569
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2570 // skip the first header_lines
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2571 std::string dummy;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2572 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	2573 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	2574
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2575 // 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	2576
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2577 // 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	2578 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	2579 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	2580
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2581 // 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	2582 octave_idx_type buf_size = 4096;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2583 if (buffer_size)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2584 buf_size = buffer_size;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2585 else if (ntimes > 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2586 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2587 // Avoid overflow of 80*ntimes...
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2588 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	2589 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	2590 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2591 // Finally, create the stream.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2592 delimited_stream is (isp,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2593 (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	2594 max_lookahead, buf_size);
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 // 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	2597 // (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	2598 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	2599 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	2600 row_idx(1) = 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 int err = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2603 octave_idx_type row = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2604
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2605 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	2606 skip_delim (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2607
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2608 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	2609
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2610 // 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	2611 if (fmt_list.set_from_first)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2612 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2613 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	2614 lines = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2615
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2616 done_after = fmt_list.numel () + 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2617 if (! err)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2618 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	2619 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2620 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2621 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	2622
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2623 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	2624
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2625 // 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	2626 // Check now which columns to merge.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2627 // 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	2628 // after reading in data.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2629 // 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	2630 // 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	2631 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	2632 int conv = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2633 if (collect_output)
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 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	2636 for (const auto& col : out)
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2637 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2638 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	2639 \|\| (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	2640 merge_with_prev[conv++] = true;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2641 else
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2642 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	2643
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2644 prev_type = col.type_id ();
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2645 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2646 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2647
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2648 // 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	2649 // infinite loop below.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2650 if (fmt_list.num_conversions () == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2651 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	2652
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2653 // 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	2654 if (! err)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2655 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2656 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	2657 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2658 if (row == 0 \|\| row >= size)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2659 {
26500 d76f9e42290a oct-stream.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26415 diff changeset	2660 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	2661 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	2662 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	2663 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2664
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2665 row_idx(0) = row;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2666 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	2667
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2668 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	2669 break;
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 }
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 ((err & 4) && ! return_on_error)
26164 7f6a50f73625 Silence compiler warnings about format identifier for octave_idx_type (bug #55046). Markus Mützel <markus.muetzel@gmx.de> parents: 25952 diff changeset	2674 error ("%s: Read error in field %d of row %" OCTAVE_IDX_TYPE_FORMAT,
7f6a50f73625 Silence compiler warnings about format identifier for octave_idx_type (bug #55046). Markus Mützel <markus.muetzel@gmx.de> parents: 25952 diff changeset	2675 who.c_str (), done_after + 1, row + 1);
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2676
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2677 // 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	2678 bool uneven_columns = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2679 if (err & 4)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2680 uneven_columns = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2681 else if (isp.eof ())
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 isp.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2684 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	2685 int last_char = isp.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2686 isp.setstate (isp.eofbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2687 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	2688 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2689
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2690 // convert return value to Cell array
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2691 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	2692
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2693 // (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	2694 // 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	2695 if (err & 1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2696 done_after = out.size () + 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2697
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	2698 int valid_rows = (row == ntimes
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	2699 ? ntimes
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	2700 : ((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	2701 dim_vector dv (valid_rows, 1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2702
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2703 ra_idx(0) = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2704 int i = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2705 if (! collect_output)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2706 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2707 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	2708 for (auto& col : out)
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2709 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2710 // 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	2711 if (i == done_after && uneven_columns)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2712 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	2713
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2714 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	2715 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	2716 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	2717 i++;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2718 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2719 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2720 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	2721 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2722 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	2723 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	2724 int prev_type = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2725
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2726 conv = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2727 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	2728 for (auto& col : out)
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2729 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2730 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	2731 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2732 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	2733 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2734 ra_idx(1) = i++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2735 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	2736 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	2737 }
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22837 diff changeset	2738 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	2739 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	2740 prev_type = col.type_id ();
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2741 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2742 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2743 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2744 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	2745 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	2746 ra_idx);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2747 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2748 }
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)), ra_idx);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2751 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2752
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2753 return retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2754 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2755
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2756 // 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	2757 // EXP_CHARS option of OPTIONS.
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 double
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2760 textscan::read_double (delimited_stream& is,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2761 const textscan_format_elt& fmt) const
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 int sign = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2764 unsigned int width_left = fmt.width;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2765 double retval = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2766 bool valid = false; // syntactically correct double?
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 int ch = is.peek ();
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 if (ch == '+')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2771 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2772 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2773 ch = is.peek ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2774 if (width_left)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2775 width_left--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2776 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2777 else if (ch == '-')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2778 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2779 sign = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2780 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2781 ch = is.peek ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2782 if (width_left)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2783 width_left--;
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2786 // Read integer part
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2787 if (ch != '.')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2788 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2789 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	2790 valid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2791 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	2792 retval = retval * 10 + (ch - '0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2793 width_left++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2794 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2795
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2796 // 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	2797 if (ch == '.' && width_left)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2798 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2799 double multiplier = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2800 int precision = fmt.prec;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2801 int i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2802
26500 d76f9e42290a oct-stream.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26415 diff changeset	2803 width_left--; // Consider width of '.'
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2804
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2805 if (precision == -1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2806 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	2807
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2808 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	2809 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	2810
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2811 for (i = 0; i < precision; i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2812 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2813 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	2814 retval += (ch - '0') * (multiplier *= 0.1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2815 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2816 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2817 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	2818 break;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2819 }
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2822 // 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	2823 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	2824 && ch <= '9')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2825 retval += multiplier;
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 if (i > 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2828 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	2829
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2830 // 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	2831 if (i == precision)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2832 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	2833 ; // discard
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2834
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2835 width_left++;
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 // 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	2839 bool used_exp = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2840 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	2841 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2842 int ch1 = is.peek ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2843 if (ch1 == '-' \|\| ch1 == '+' \|\| (ch1 >= '0' && ch1 <= '9'))
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	2844 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	2845 // 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	2846 width_left--; // count "E"
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2847 int exp = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2848 int exp_sign = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2849 if (ch1 == '+')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2850 {
26500 d76f9e42290a oct-stream.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26415 diff changeset	2851 width_left--;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2852 is.get ();
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 else if (ch1 == '-')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2855 {
26500 d76f9e42290a oct-stream.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26415 diff changeset	2856 width_left--;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2857 exp_sign = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2858 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2859 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2860 valid = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2861 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	2862 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2863 exp = exp*10 + ch - '0';
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2864 valid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2865 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2866 width_left++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2867 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	2868 is.putback (ch);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2869
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2870 double multiplier = pown (10, exp);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2871 if (exp_sign > 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2872 retval *= multiplier;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2873 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2874 retval /= multiplier;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2875
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2876 used_exp = true;
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 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2879 is.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2880 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	2881 is.putback (ch);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2882
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2883 // Check for +/- inf and NaN
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2884 if (! valid && width_left >= 3)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2885 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2886 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	2887 if (i == 0)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2888 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	2889 retval = numeric_limits<double>::Inf ();
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2890 valid = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2891 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2892 else if (i == 1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2893 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	2894 retval = numeric_limits<double>::NaN ();
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2895 valid = true;
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 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2898
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2899 if (! valid)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2900 is.setstate (std::ios::failbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2901 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2902 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	2903
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2904 return retval * sign;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2905 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2906
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2907 // 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	2908 // 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	2909 // 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	2910
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2911 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2912 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	2913 Complex& val) const
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 double im = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2916 double re = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2917 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	2918 bool inf = false;
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 ch = is.peek ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2921 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	2922 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2923 ch = is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2924 int ch2 = is.peek ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2925 if (ch2 == 'i' \|\| ch2 == 'j')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2926 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2927 double value = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2928 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2929 // Check not -inf
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2930 if (is.peek () == 'n')
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 char *pos = is.tellg ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2933 std::ios::iostate state = is.rdstate ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2934
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2935 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2936 ch2 = is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2937 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	2938 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2939 inf = true;
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	2940 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	2941 : -numeric_limits<double>::Inf ());
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2942 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	2943 }
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	2944 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	2945 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2946 is.clear (state);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2947 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	2948 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2949 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2950
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2951 im = (ch == '+') ? value : -value;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2952 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2953 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2954 is.putback (ch);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2955 }
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 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	2958 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2959 char *pos = is.tellg ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2960 std::ios::iostate state = is.rdstate ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2961 //re = octave_read_value<double> (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2962 re = read_double (is, fmt);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2963
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2964 // check for "treat as empty" string
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2965 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	2966 && (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	2967 \|\| re == numeric_limits<double>::Inf ()))
22326 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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2970 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	2971 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2972 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	2973 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2974 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	2975 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2976 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2977 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2978 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	2979 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2980 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	2981
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2982 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	2983 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	2984
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2985 // 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	2986 // 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	2987 // that matches.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2988 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	2989 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	2990
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2991 is.clear (state);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2992 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	2993 // 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	2994
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2995 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	2996 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2997 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	2998 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	2999 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3000 as_empty = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3001 // read just the right amount
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3002 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	3003 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3004 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3005 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3006 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3007 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3008
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3009 if (! is.eof () && ! as_empty)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3010 {
26566 f8d380d04b01 Fix dead assignments found by clang static analysis (bug #55440). Rik <rik@octave.org> parents: 26500 diff changeset	3011 state = is.rdstate (); // before tellg, since that fails at EOF
f8d380d04b01 Fix dead assignments found by clang static analysis (bug #55440). Rik <rik@octave.org> parents: 26500 diff changeset	3012
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3013 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	3014 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	3015 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3016 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3017 im = re;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3018 re = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3019 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3020 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	3021 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3022 // 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	3023 pos = is.tellg ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3024 state = is.rdstate ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3025
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3026 //im = octave_read_value<double> (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3027 im = read_double (is, fmt);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3028 if (is.fail ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3029 im = 1;
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 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	3032 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3033 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3034 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3035 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	3036 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	3037 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	3038 }
22326 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 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	3041 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	3042 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3043 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3044 if (as_empty)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3045 val = empty_value.scalar_value ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3046 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3047 val = Complex (re, im);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3048 }
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 // 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	3051
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3052 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3053 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	3054 std::string& val) const
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 int c1 = std::istream::traits_type::eof ();
27424 17b915ad4b73 Fix error with %q format and textscan (bug #56917). Rik <rik@octave.org> parents: 27385 diff changeset	3057 std::ostringstream obuf; // FIXME: is this optimized for growing?
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3058
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3059 while (is && ((c1 = (is && ! is.eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3060 ? is.get_undelim ()
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3061 : std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3062 != std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3063 && pattern.find (c1) == std::string::npos)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3064 obuf << static_cast<char> (c1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3065
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3066 val = obuf.str ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3067
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3068 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	3069 is.putback (c1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3070
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3071 return c1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3072 }
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 // 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	3075 // 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	3076
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3077 std::string
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3078 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	3079 const std::string& ends) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3080 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3081 std::string retval ("");
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3082 bool done = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3083 do
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3084 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3085 // 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	3086 std::string next;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3087 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	3088 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	3089
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3090 int last = (! is.eof ()
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3091 ? 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	3092
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3093 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	3094 {
24346 f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3095 if (last == eol1 \|\| last == eol2)
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	3096 break;
24346 f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3097
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3098 retval = retval + static_cast<char> (last);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3099 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	3100 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3101 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	3102 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	3103 ? retval.length () - delim.length ()
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3104 : 0);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3105 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	3106 if (may_match == delim)
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 done = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3109 retval = retval.substr (0, start);
24346 f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3110 if (start == 0)
f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3111 is.putback (last);
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3112 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3113 }
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 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3116 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3117 while (! done && is && ! is.eof ());
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3118
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3119 return retval;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3120 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3121
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3122 // 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	3123 // 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	3124 // 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	3125
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3126 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3127 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	3128 std::string& val) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3129 {
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	3130 if (delim_list.isempty ())
22326 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 unsigned int i = 0;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3133 unsigned int width = fmt.width;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3134
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3135 for (i = 0; i < width; i++)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3136 {
23824 061a343089be Miscellaneous cleanups of C++11 std::string code. Rik <rik@octave.org> parents: 23812 diff changeset	3137 // 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	3138 if (i >= val.length ())
061a343089be Miscellaneous cleanups of C++11 std::string code. Rik <rik@octave.org> parents: 23812 diff changeset	3139 val.append (std::max (val.length (),
061a343089be Miscellaneous cleanups of C++11 std::string code. Rik <rik@octave.org> parents: 23812 diff changeset	3140 static_cast<size_t> (16)), '\0');
061a343089be Miscellaneous cleanups of C++11 std::string code. Rik <rik@octave.org> parents: 23812 diff changeset	3141
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3142 int ch = is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3143 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	3144 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3145 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	3146 break;
22326 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 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3149 val[i] = ch;
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 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	3152 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3153 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	3154 {
24346 f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3155 std::string ends (delim_list.numel () + 2, '\0');
f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3156 int i;
f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3157 for (i = 0; i < delim_list.numel (); i++)
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3158 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3159 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	3160 ends[i] = tmp.back ();
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3161 }
24346 f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3162 ends[i++] = eol1;
f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3163 ends[i++] = eol2;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3164 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	3165 }
26706 ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	3166
ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	3167 // convert from codepage
ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	3168 if (m_encoding.compare ("utf-8"))
ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	3169 val = string::u8_from_encoding ("textscan", val, m_encoding);
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3170 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3171
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3172 // 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	3173
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3174 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3175 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	3176 std::string& val) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3177 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3178 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	3179 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	3180
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3181 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	3182 obuf << static_cast<char> (c1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3183
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3184 val = obuf.str ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3185 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	3186 is.putback (c1);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3187 return c1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3188 }
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 // 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	3191 // 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	3192 // 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	3193
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3194 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3195 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	3196 std::string& val)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3197 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3198 skip_whitespace (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3199
23803 90689bdbe048 Use C++11 raw string literals to avoid escaping double quotes. Rik <rik@octave.org> parents: 23796 diff changeset	3200 if (is.peek () != '"')
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3201 scan_string (is, fmt, val);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3202 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3203 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3204 is.get ();
23803 90689bdbe048 Use C++11 raw string literals to avoid escaping double quotes. Rik <rik@octave.org> parents: 23796 diff changeset	3205 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	3206 is.get (); // swallow "
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3207
27424 17b915ad4b73 Fix error with %q format and textscan (bug #56917). Rik <rik@octave.org> parents: 27385 diff changeset	3208 while (is && is.peek_undelim () == '"') // if double ",
17b915ad4b73 Fix error with %q format and textscan (bug #56917). Rik <rik@octave.org> parents: 27385 diff changeset	3209 { // insert one in stream,
17b915ad4b73 Fix error with %q format and textscan (bug #56917). Rik <rik@octave.org> parents: 27385 diff changeset	3210 is.get (); // keep looking for single "
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3211 std::string val1;
23803 90689bdbe048 Use C++11 raw string literals to avoid escaping double quotes. Rik <rik@octave.org> parents: 23796 diff changeset	3212 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	3213 val = val + '"' + val1;
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3214 is.get_undelim ();
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 }
26706 ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	3217
ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	3218 // convert from codepage
ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	3219 if (m_encoding.compare ("utf-8"))
ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	3220 val = string::u8_from_encoding ("textscan", val, m_encoding);
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3221 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3222
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3223 // 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	3224 // including any whitespace or delimiters.
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 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3227 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	3228 std::string& val) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3229 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3230 val.resize (fmt.width);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3231
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3232 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	3233 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3234 int ch = is.get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3235 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	3236 val[i] = ch;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3237 else
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 val.resize (i);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3240 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3241 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3242 }
26706 ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	3243
ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	3244 // convert from codepage
ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	3245 if (m_encoding.compare ("utf-8"))
ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	3246 val = string::u8_from_encoding ("textscan", val, m_encoding);
22326 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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3249 // 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	3250
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3251 void
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3252 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	3253 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	3254 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3255 skip_whitespace (is);
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 is.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3258
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3259 octave_value val;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3260 if (fmt.numeric)
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 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	3263 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3264 Complex v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3265 skip_whitespace (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3266 scan_complex (is, fmt, v);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3267
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3268 if (! fmt.discard && ! is.fail ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3269 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3270 if (fmt.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	3271 {
23582 0cc2011d800e maint: Deprecate is_real_type and replace with isreal. Rik <rik@octave.org> parents: 23580 diff changeset	3272 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	3273 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	3274 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3275 {
23582 0cc2011d800e maint: Deprecate is_real_type and replace with isreal. Rik <rik@octave.org> parents: 23580 diff changeset	3276 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	3277 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	3278 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3279 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	3280 }
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	3281 }
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	3282 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	3283 {
23582 0cc2011d800e maint: Deprecate is_real_type and replace with isreal. Rik <rik@octave.org> parents: 23580 diff changeset	3284 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	3285 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	3286 float (v.real ()));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3287 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3288 {
23582 0cc2011d800e maint: Deprecate is_real_type and replace with isreal. Rik <rik@octave.org> parents: 23580 diff changeset	3289 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	3290 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	3291 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3292 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	3293 FloatComplex (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 }
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3297 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3298 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3299 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3300 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	3301 // 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	3302 // 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	3303 skip_whitespace (is);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3304 v = read_double (is, fmt);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3305 if (! fmt.discard && ! is.fail ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3306 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	3307 {
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3308 case 64:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3309 switch (fmt.type)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3310 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3311 case 'd':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3312 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3313 octave_int64 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3314 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	3315 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3316 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3317
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3318 case 'u':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3319 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3320 octave_uint64 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3321 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	3322 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3323 break;
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 break;
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 case 32:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3328 switch (fmt.type)
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 case 'd':
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 octave_int32 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3333 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	3334 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3335 break;
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 case 'u':
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 octave_uint32 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3340 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	3341 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3342 break;
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 break;
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 case 16:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3347 if (fmt.type == 'd')
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 octave_int16 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3350 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	3351 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3352 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3353 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3354 octave_uint16 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3355 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	3356 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3357 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3358
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3359 case 8:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3360 if (fmt.type == 'd')
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3361 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3362 octave_int8 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3363 ov.internal_rep ()->fast_elem_insert (row(0), vv);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3364 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3365 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3366 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3367 octave_uint8 vv = v;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3368 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	3369 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3370 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3371 }
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
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3374 if (is.fail () & ! fmt.discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3375 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	3376 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3377 else
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 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	3380 switch (fmt.type)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3381 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3382 case 's':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3383 scan_string (is, fmt, vv);
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 case 'q':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3387 scan_qstring (is, fmt, vv);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3388 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3389
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3390 case 'c':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3391 scan_cstring (is, fmt, vv);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3392 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3393
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3394 case '[':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3395 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	3396 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3397
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3398 case '^':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3399 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	3400 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3401 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3402
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3403 if (! fmt.discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3404 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	3405 Cell (octave_value (vv)));
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3406
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3407 // 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	3408 if (! vv.empty ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3409 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	3410 }
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 is.field_done ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3413 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3414
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3415 // 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	3416 // values in row ROW of retval.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3417
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3418 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3419 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	3420 textscan_format_list& fmt_list,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3421 std::list<octave_value>& retval,
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3422 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	3423 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3424 const textscan_format_elt *elem = fmt_list.first ();
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25336 diff changeset	3425 auto out = retval.begin ();
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3426 bool no_conversions = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3427 bool done = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3428 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	3429 bool nothing_worked = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3430
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3431 octave_quit ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3432
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3433 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	3434 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3435 bool this_conversion_failed = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3436
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3437 // Clear fail of previous numeric conversions.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3438 is.clear ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3439
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3440 switch (elem->type)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3441 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3442 case 'C':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3443 case 'D':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3444 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	3445 who.c_str (), elem->type);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3446 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3447
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3448 case 'u':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3449 case 'd':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3450 case 'f':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3451 case 'n':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3452 case 's':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3453 case '[':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3454 case '^':
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3455 case 'q':
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 scan_one (is, elem, out, row);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3458 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3459
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3460 case textscan_format_elt::literal_conversion :
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3461 match_literal (is, *elem);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3462 break;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3463
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3464 default:
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3465 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	3466 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3467
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3468 if (! is.fail ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3469 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3470 if (! elem->discard)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3471 no_conversions = false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3472 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3473 else
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3474 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3475 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	3476
24346 f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3477 if (! is.eof ())
f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3478 {
f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3479 if (delim_list.isempty ())
f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3480 {
f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3481 if (! is_delim (is.peek ()))
f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3482 this_conversion_failed = true;
f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3483 }
f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3484 else // Cell array of multi-character delimiters
f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3485 {
f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3486 char *pos = is.tellg ();
f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3487 if (-1 == lookahead (is, delim_list, delim_len))
f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3488 this_conversion_failed = true;
f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3489 is.clear ();
f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3490 is.seekg (pos); // reset to position before look-ahead
f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3491 }
f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3492 }
22326 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)
24634 ab2321d4ba03 maint: strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3730 whitespace.erase (std::remove (whitespace.begin (),
24303 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
25951 7a507e71d922 style fixes John W. Eaton <jwe@octave.org> parents: 25424 diff changeset	3792 if (is && comment_style.numel () > 0
7a507e71d922 style fixes John W. Eaton <jwe@octave.org> parents: 25424 diff changeset	3793 && ! strncmp (comment_style(0).string_value ().substr (1).c_str (),
7a507e71d922 style fixes John W. Eaton <jwe@octave.org> parents: 25424 diff changeset	3794 look, comment_len-1))
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3795 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3796 found_comment = true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3797
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3798 std::string dummy;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3799 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	3800 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3801 std::string eol (3, '\0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3802 eol[0] = eol1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3803 eol[1] = eol2;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3804
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3805 scan_caret (is, eol, dummy);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3806 c1 = is.get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3807 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	3808 is.get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3809 lines++;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3810 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3811 else // matching pair
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3812 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3813 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	3814 // last char of end-comment sequence
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3815 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	3816 std::string may_match ("");
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3817 do
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3818 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3819 // 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	3820 scan_caret (is, last, dummy);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3821 is.get_undelim (); // (read LAST itself)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3822
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3823 may_match = may_match + dummy + last;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3824 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	3825 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3826 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	3827 may_match = may_match.substr (start);
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 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3830 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	3831 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3832 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3833 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	3834 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3835 is.clear (state);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3836 is.seekg (pos);
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 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3840 while (found_comment);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3841
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3842 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	3843 is.putback (c1);
27424 17b915ad4b73 Fix error with %q format and textscan (bug #56917). Rik <rik@octave.org> parents: 27385 diff changeset	3844
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3845 return c1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3846 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3847
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3848 // 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	3849 // 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	3850 // 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	3851
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3852 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3853 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	3854 bool case_sensitive) const
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3855 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3856 // target strings may be different sizes.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3857 // 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	3858 // that matches.
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 char *pos = is.tellg ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3861
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3862 std::string tmp (max_len, '\0');
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3863 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	3864
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3865 is.clear ();
24346 f77da8da0f3f Fix textscan missing fields and number reads for cell-specified delimiters (bug #52550). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24304 diff changeset	3866 is.seekg (pos); // reset to position before read
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	3867 // 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	3868
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3869 int i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3870 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	3871 compare = (case_sensitive ? strncmp : strncasecmp);
22326 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 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	3874 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3875 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	3876 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	3877 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3878 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	3879 break;
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 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3882
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3883 if (i == targets.numel ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3884 i = -1;
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 return i;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3887 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3888
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3889 // Skip delimiters -- multiple if MultipleDelimsAsOne specified.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3890 int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3891 textscan::skip_delim (delimited_stream& is)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3892 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3893 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	3894 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	3895 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3896 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	3897 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3898 is.get ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3899 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	3900 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	3901
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3902 if (multiple_delims_as_one)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3903 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3904 int prev = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3905 // skip multiple delims.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3906 // 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	3907 while (is && ((c1 = is.get_undelim ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3908 != std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3909 && (((c1 == eol1 \|\| c1 == eol2) && ++lines)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3910 \|\| isspace (c1) \|\| is_delim (c1)))
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3911 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3912 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	3913 lines--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3914 prev = c1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3915 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3916 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	3917 is.putback (c1);
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 }
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 else // multi-character delimiter
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 int first_match;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3924
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3925 if (c1 == eol1 \|\| c1 == eol2
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3926 \|\| (-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	3927 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3928 if (c1 == eol1)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3929 {
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	3930 is.get_undelim ();
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3931 if (is.peek_undelim () == eol2)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3932 is.get_undelim ();
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 else if (c1 == eol2)
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 is.get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3937 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3938
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3939 if (multiple_delims_as_one)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3940 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3941 int prev = -1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3942 // skip multiple delims.
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3943 // 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	3944 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	3945 != std::istream::traits_type::eof ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3946 && (((c1 == eol1 \|\| c1 == eol2) && ++lines)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3947 \|\| -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	3948 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3949 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	3950 lines--;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3951 prev = c1;
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 }
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 return c1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3958 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3959
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3960 // 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	3961 // 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	3962 // false (and set failbit).
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3963
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3964 bool
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3965 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	3966 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3967 // "false" -> treat EOL as normal space
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3968 // 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	3969 skip_whitespace (is, false);
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 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	3972 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3973 int ch = is.get_undelim ();
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3974 if (ch != fmt.text[i])
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3975 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3976 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	3977 is.putback (ch);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3978 is.setstate (std::ios::failbit);
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3979 return false;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3980 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3981 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3982 return true;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	3983 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3984
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3985 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3986 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	3987 {
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	3988 m_fail = true;
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	3989 m_errmsg = msg;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3990 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3991
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3992 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3993 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	3994 {
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	3995 m_fail = true;
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	3996 m_errmsg = who + ": " + msg;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3997 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3998
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	3999 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4000 base_stream::clear (void)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4001 {
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	4002 m_fail = false;
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	4003 m_errmsg = "";
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4004 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4005
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4006 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4007 base_stream::clearerr (void)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4008 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4009 std::istream *is = input_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4010 std::ostream *os = output_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4011
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4012 if (is)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4013 is->clear ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4014
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4015 if (os)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4016 os->clear ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4017 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4018
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4019 // 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	4020 // are those that define is).
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4021
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4022 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4023 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	4024 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	4025 {
27301 a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27279 diff changeset	4026 interpreter& interp = __get_interpreter__ ("base_stream::do_gets");
a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27279 diff changeset	4027
a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27279 diff changeset	4028 if (interp.interactive () && file_number () == 0)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4029 ::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	4030 who.c_str ());
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::string retval;
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 err = false;
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 std::istream *isp = input_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4037
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4038 if (! isp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4039 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4040 err = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4041 invalid_operation (who, "reading");
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 else
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 std::istream& is = *isp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4046
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4047 std::ostringstream buf;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4048
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4049 int c = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4050 int char_count = 0;
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 if (max_len != 0)
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 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	4055 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4056 char_count++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4057
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4058 // 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	4059 if (c == '\r')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4060 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4061 if (! strip_newline)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4062 buf << static_cast<char> (c);
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 c = is.get ();
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 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	4067 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4068 if (c == '\n')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4069 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4070 char_count++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4071
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4072 if (! strip_newline)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4073 buf << static_cast<char> (c);
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 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4076 is.putback (c);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4077 }
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 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4080 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4081 else if (c == '\n')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4082 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4083 if (! strip_newline)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4084 buf << static_cast<char> (c);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4085
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4086 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4087 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4088 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4089 buf << static_cast<char> (c);
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 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	4092 break;
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 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4095
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4096 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	4097 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4098 // 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	4099 // 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	4100 // corresponding C-library functions do.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4101 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	4102 if (! is.eof ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4103 is.putback (disgusting_compatibility_hack);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4104 }
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 if (is.good () \|\| (is.eof () && char_count > 0))
27564 8edca821f170 Add basic support for string encoding with fgetl and fgets (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27474 diff changeset	4107 {
8edca821f170 Add basic support for string encoding with fgetl and fgets (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27474 diff changeset	4108 retval = buf.str ();
8edca821f170 Add basic support for string encoding with fgetl and fgets (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27474 diff changeset	4109 if (encoding ().compare ("utf-8"))
8edca821f170 Add basic support for string encoding with fgetl and fgets (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27474 diff changeset	4110 retval = string::u8_from_encoding (who, retval, encoding ());
8edca821f170 Add basic support for string encoding with fgetl and fgets (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27474 diff changeset	4111 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4112 else
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 err = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4115
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4116 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	4117 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	4118 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4119 error (who, "read error");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4120 }
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4123 return retval;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4126 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4127 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	4128 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4129 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4130 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	4131 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4132
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4133 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4134 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	4135 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4136 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4137 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	4138 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4139
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4140 off_t
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4141 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	4142 {
27301 a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27279 diff changeset	4143 interpreter& interp = __get_interpreter__ ("base_stream::skipl");
a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27279 diff changeset	4144
a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27279 diff changeset	4145 if (interp.interactive () && file_number () == 0)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4146 ::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	4147 who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4148
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4149 off_t cnt = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4150
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4151 err = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4152
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4153 std::istream *isp = input_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4154
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4155 if (! isp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4156 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4157 err = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4158 invalid_operation (who, "reading");
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 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4161 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4162 std::istream& is = *isp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4163
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4164 int c = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4165 int lastc = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4166 cnt = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4167
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4168 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	4169 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4170 // 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	4171 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	4172 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4173 if (++cnt == num)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4174 break;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4177 lastc = c;
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 // 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	4181 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	4182 is.get ();
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 if (is.bad ())
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 err = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4187 error (who, "read error");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4188 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4189
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4190 if (err)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4191 cnt = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4192 }
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 return cnt;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4197 template <typename T>
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4198 std::istream&
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4199 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	4200 T *valptr)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4201 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4202 T value = T ();
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 switch (fmt.type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4205 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4206 case 'o':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4207 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	4208 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4209
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4210 case 'x':
27385 9a59876c1c4c accept 'X' as scanf conversion specifier (bug #56869) Mike Miller <mtmiller@octave.org> parents: 27382 diff changeset	4211 case 'X':
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4212 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	4213 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4214
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4215 case 'i':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4216 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4217 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	4218
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4219 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	4220 && isspace (c1))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4221 ; // skip whitespace
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4222
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4223 if (c1 != std::istream::traits_type::eof ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4224 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4225 if (c1 == '0')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4226 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4227 int c2 = is.peek ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4228
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4229 if (c2 == 'x' \|\| c2 == 'X')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4230 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4231 is.ignore ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4232 if (std::isxdigit (is.peek ()))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4233 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	4234 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4235 value = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4236 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4237 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4238 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4239 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	4240 \|\| 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	4241 \|\| c2 == '6' \|\| c2 == '7')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4242 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	4243 else if (c2 == '8' \|\| c2 == '9')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4244 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4245 // 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	4246 // 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	4247 // input to fcn.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4248 // 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	4249 value = 0;
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 else
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4252 value = 0;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4253 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4254 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4255 else
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4256 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4257 is.putback (c1);
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 is >> value;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4260 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4261 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4262 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4263 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4264
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4265 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4266 is >> value;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4267 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4268 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4269
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4270 // 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	4271 // 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	4272 // 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	4273 // 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	4274 // 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	4275 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	4276 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	4277
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4278 // 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	4279 // want to continue reading.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4280 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	4281 *valptr = value;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4282
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4283 return is;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4286 template <typename T>
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4287 std::istream&
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23446 diff changeset	4288 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	4289 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4290 if (fmt.width)
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 // 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	4293 // temporary stringstream buffer.
27132 8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4294 std::string strbuf;
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4295
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4296 auto orig_pos = is.tellg ();
23059 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 is.width (fmt.width);
27132 8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4299 is >> strbuf;
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4300
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4301 std::istringstream ss (strbuf);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4302
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4303 octave_scan_1 (ss, fmt, valptr);
27132 8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4304
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4305 if (! ss.eof ())
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4306 {
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4307 // If fewer characters than width were used to read a number then
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4308 // the original istream object positioning is incorrect.
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4309 // Rather than attempt to update istream state and positioning,
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4310 // just redo the '>>' operation with the correct width so that
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4311 // all flags get set correctly.
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4312
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4313 is.clear (); // Clear EOF, FAILBIT, BADBIT
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4314 is.seekg (orig_pos, is.beg);
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4315
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4316 int chars_read = ss.tellg ();
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4317 if (chars_read > 0)
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4318 {
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4319 is.width (chars_read);
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4320 is >> strbuf;
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4321 }
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4322 }
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4323
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4324 // If pattern failed to match then propagate fail bit to 'is' stream.
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4325 if (ss.fail ())
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4326 is.setstate (std::ios::failbit);
8ea53aa9ac39 Fix stream positioning when using scanf with widths (bug #56200). Rik <rik@octave.org> parents: 27102 diff changeset	4327
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4328 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4329 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4330 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	4331
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4332 return is;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4333 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4334
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4335 // 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	4336 // 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	4337
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4338 template <>
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4339 std::istream&
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4340 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	4341 char *valptr)
23059 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 return is >> valptr;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4344 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4345
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4346 template <>
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4347 std::istream&
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23446 diff changeset	4348 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	4349 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4350 double& ref = *valptr;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4351
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4352 switch (fmt.type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4353 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4354 case 'e':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4355 case 'f':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4356 case 'g':
27382 9354d33dfbc4 accept 'E' and 'G' as scanf conversion specifiers (bug #56869) John W. Eaton <jwe@octave.org> parents: 27301 diff changeset	4357 case 'E':
9354d33dfbc4 accept 'E' and 'G' as scanf conversion specifiers (bug #56869) John W. Eaton <jwe@octave.org> parents: 27301 diff changeset	4358 case 'G':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4359 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4360 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	4361
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4362 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	4363 && isspace (c1))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4364 ; // skip whitespace
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4365
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4366 if (c1 != std::istream::traits_type::eof ())
9701 531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4367 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4368 is.putback (c1);
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 ref = octave_read_value<double> (is);
9701 531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4371 }
531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	4372 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4373 break;
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 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4376 panic_impossible ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4377 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4378 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4379
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4380 return is;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4381 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4382
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4383 template <typename T>
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4384 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4385 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	4386 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	4387 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	4388 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	4389 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4390 octave_scan (is, fmt, valptr);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4391
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4392 if (! is)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4393 return;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4394
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4395 if (idx == max_size && ! discard)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4396 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4397 max_size *= 2;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4398
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4399 if (nr > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4400 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	4401 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4402 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	4403
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4404 data = mval.fortran_vec ();
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4407 if (! discard)
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 conversion_count++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4410 data[idx++] = *(valptr);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4411 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4412 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4413
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4414 template void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4415 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	4416 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	4417 octave_idx_type, octave_idx_type, bool);
2572 5c2be7c820ed [project @ 1996-12-08 04:02:46 by jwe] jwe parents: 2435 diff changeset	4418
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4419 #define DO_WHITESPACE_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4420 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4421 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4422 int c = std::istream::traits_type::eof (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4423 \
21184 3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4424 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	4425 && isspace (c)) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4426 { /* skip whitespace */ } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4427 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4428 if (c != std::istream::traits_type::eof ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4429 is.putback (c); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4430 } \
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4431 while (0)
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4432
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4433 #define DO_LITERAL_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4434 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4435 { \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4436 int c = std::istream::traits_type::eof (); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4437 \
24753 ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	4438 int n = fmt.length (); \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4439 int i = 0; \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4440 \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4441 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	4442 { \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4443 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	4444 { \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4445 i++; \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4446 continue; \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4447 } \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4448 else \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4449 { \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4450 is.putback (c); \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4451 break; \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4452 } \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4453 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4454 \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4455 if (i != n) \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4456 is.setstate (std::ios::failbit); \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4457 } \
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4458 while (0)
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4459
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4460 #define DO_PCT_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4461 do \
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 int c = is.get (); \
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 if (c != std::istream::traits_type::eof ()) \
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 (c != '%') \
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 is.putback (c); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4470 is.setstate (std::ios::failbit); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4471 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4472 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4473 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4474 is.setstate (std::ios::failbit); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4475 } \
3640 d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	4476 while (0)
d3b0ff09dda7 [project @ 2000-03-24 10:28:19 by jwe] jwe parents: 3639 diff changeset	4477
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4478 #define BEGIN_C_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4479 is.unsetf (std::ios::skipws); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4480 \
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	4481 int width = (elt->width ? elt->width : 1); \
22197 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 std::string tmp (width, '\0'); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4484 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4485 int c = std::istream::traits_type::eof (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4486 int n = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4487 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4488 while (is && n < width \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4489 && (c = is.get ()) != std::istream::traits_type::eof ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4490 tmp[n++] = static_cast<char> (c); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4491 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4492 if (n > 0 && c == std::istream::traits_type::eof ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4493 is.clear (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4494 \
12984 7626f8934466 correctly resize scanf output for %c formats (bug #34037) John W. Eaton <jwe@octave.org> parents: 12966 diff changeset	4495 tmp.resize (n)
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4496
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4497 // 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	4498 // 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	4499 #define BEGIN_S_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4500 int width = elt->width; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4501 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4502 std::string tmp; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4503 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4504 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4505 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4506 if (width) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4507 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4508 tmp = std::string (width, '\0'); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4509 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4510 int c = std::istream::traits_type::eof (); \
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 int n = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4513 \
21184 3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4514 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	4515 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4516 if (! isspace (c)) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4517 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4518 tmp[n++] = static_cast<char> (c); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4519 break; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4520 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4521 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4522 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4523 while (is && n < width \
21184 3db899f1d54c use istream::traits_type::eof () instead of EOF John W. Eaton <jwe@octave.org> parents: 21147 diff changeset	4524 && (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	4525 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4526 if (isspace (c)) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4527 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4528 is.putback (c); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4529 break; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4530 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4531 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4532 tmp[n++] = static_cast<char> (c); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4533 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4534 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4535 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	4536 is.clear (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4537 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4538 tmp.resize (n); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4539 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4540 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4541 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4542 is >> std::ws >> tmp; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4543 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4544 } \
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4545 while (0)
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4546
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4547 // 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	4548 #define BEGIN_CHAR_CLASS_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4549 int width = elt->width; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4550 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4551 std::string tmp; \
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 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4554 { \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4555 if (! width) \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4556 width = std::numeric_limits<int>::max (); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4557 \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4558 std::ostringstream buf; \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4559 \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4560 std::string char_class = elt->char_class; \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4561 \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4562 int c = std::istream::traits_type::eof (); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4563 \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4564 if (elt->type == '[') \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4565 { \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4566 int chars_read = 0; \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4567 while (is && chars_read++ < width \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4568 && (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	4569 && 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	4570 buf << static_cast<char> (c); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4571 } \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4572 else \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4573 { \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4574 int chars_read = 0; \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4575 while (is && chars_read++ < width \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4576 && (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	4577 && 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	4578 buf << static_cast<char> (c); \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4579 } \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4580 \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4581 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	4582 && 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	4583 is.putback (c); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4584 \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4585 tmp = buf.str (); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4586 \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4587 if (tmp.empty ()) \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4588 is.setstate (std::ios::failbit); \
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4589 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	4590 is.clear (); \
22197 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 } \
3483 1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4593 while (0)
1bb6e519a4a2 [project @ 2000-01-26 23:37:10 by jwe] jwe parents: 3410 diff changeset	4594
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4595 #define FINISH_CHARACTER_CONVERSION() \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4596 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4597 { \
26703 29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26640 diff changeset	4598 if (encoding ().compare ("utf-8")) \
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27069 diff changeset	4599 tmp = string::u8_from_encoding (who, tmp, encoding ()); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4600 width = tmp.length (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4601 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4602 if (is) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4603 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4604 int i = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4605 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4606 if (! discard) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4607 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4608 conversion_count++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4609 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4610 while (i < width) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4611 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4612 if (data_index == max_size) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4613 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4614 max_size *= 2; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4615 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4616 if (all_char_conv) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4617 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4618 if (one_elt_size_spec) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4619 mval.resize (1, max_size, 0.0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4620 else if (nr > 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4621 mval.resize (nr, max_size / nr, 0.0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4622 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4623 panic_impossible (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4624 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4625 else if (nr > 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4626 mval.resize (nr, max_size / nr, 0.0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4627 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4628 mval.resize (max_size, 1, 0.0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4629 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4630 data = mval.fortran_vec (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4631 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4632 \
24496 62a7d3f292d6 Correctly handle reading of characters >127 in scanf family (bug #52681). Markus Mützel <markus.muetzel@gmx.de> parents: 24303 diff changeset	4633 data[data_index++] = static_cast<unsigned char> \
62a7d3f292d6 Correctly handle reading of characters >127 in scanf family (bug #52681). Markus Mützel <markus.muetzel@gmx.de> parents: 24303 diff changeset	4634 (tmp[i++]); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4635 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4636 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4637 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4638 } \
3410 ee5f222025c3 [project @ 2000-01-07 04:19:05 by jwe] jwe parents: 3342 diff changeset	4639 while (0)
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	4640
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4641 octave_value
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4642 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	4643 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	4644 bool one_elt_size_spec,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4645 octave_idx_type& conversion_count,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4646 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4647 {
27301 a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27279 diff changeset	4648 interpreter& interp = __get_interpreter__ ("base_stream::do_scanf");
a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27279 diff changeset	4649
a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27279 diff changeset	4650 if (interp.interactive () && file_number () == 0)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4651 ::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	4652 who.c_str ());
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 octave_value retval = Matrix ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4655
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4656 conversion_count = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4657
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4658 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	4659
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4660 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	4661
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4662 if (nr == 0 \|\| nc == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4663 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4664 if (one_elt_size_spec)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4665 nc = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4666
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4667 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	4668 }
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 std::istream *isp = input_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4671
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4672 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	4673
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4674 Matrix mval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4675 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	4676 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	4677
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4678 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	4679 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	4680
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4681 if (all_char_conv)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4682 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4683 // 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	4684 // 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	4685 if (one_elt_size_spec)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4686 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4687 max_size = 512;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4688 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	4689
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4690 if (nr > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4691 max_conv = nr;
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 else if (nr > 0)
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 if (nc > 0)
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 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	4698 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	4699 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4700 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4701 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4702 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	4703 max_size = nr * 32;
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 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4706 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4707 panic_impossible ();
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 else if (nr > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4710 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4711 if (nc > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4712 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4713 // Will not resize later.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4714 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	4715 max_size = nr * nc;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4716 max_conv = max_size;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4717 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4718 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4719 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4720 // Maybe resize later.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4721 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	4722 max_size = nr * 32;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4723 }
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 // Maybe resize later.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4728 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	4729 max_size = 32;
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
26411 ab6b8d8e0307 oct-stream.cc: Fix static analyzer detected V519 issue (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26376 diff changeset	4732 double *data = mval.fortran_vec ();
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4733
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4734 if (isp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4735 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4736 std::istream& is = *isp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4737
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4738 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	4739
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4740 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	4741
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4742 octave_idx_type trips = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4743
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4744 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	4745
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4746 for (;;)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4747 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4748 octave_quit ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4749
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4750 if (elt)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4751 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4752 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	4753 \|\| (! (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	4754 \|\| 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	4755 \|\| elt->type == '%')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4756 && 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	4757 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4758 // 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	4759 // 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	4760 // 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	4761 // 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	4762 // 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	4763 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	4764 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4765 final_nr = 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4766 final_nc = data_index;
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 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4769 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4770 final_nr = nr;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4771 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	4772 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4773
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4774 break;
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 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	4777 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4778 max_size *= 2;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4779
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4780 if (all_char_conv)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4781 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4782 if (one_elt_size_spec)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4783 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	4784 else if (nr > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4785 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	4786 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4787 panic_impossible ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4788 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4789 else if (nr > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4790 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	4791 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4792 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	4793
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4794 data = mval.fortran_vec ();
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
24753 ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	4797 std::string fmt = elt->text;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4798
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4799 bool discard = elt->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 switch (elt->type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4802 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4803 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	4804 DO_WHITESPACE_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4805 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4806
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4807 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	4808 DO_LITERAL_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4809 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4810
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4811 case '%':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4812 DO_PCT_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4813 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4814
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4815 case 'd': case 'i':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4816 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4817 switch (elt->modifier)
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 'h':
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 int16_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 case 'l':
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 int64_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;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4836
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4837 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4838 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4839 int32_t tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4840 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	4841 data_index, conversion_count,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4842 nr, max_size, discard);
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 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4845 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4846 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4847 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4848
27385 9a59876c1c4c accept 'X' as scanf conversion specifier (bug #56869) Mike Miller <mtmiller@octave.org> parents: 27382 diff changeset	4849 case 'o': case 'u': case 'x': case 'X':
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4850 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4851 switch (elt->modifier)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4852 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4853 case 'h':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4854 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4855 uint16_t tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4856 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	4857 data_index, conversion_count,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4858 nr, max_size, discard);
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 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4861
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4862 case 'l':
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 uint64_t tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4865 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	4866 data_index, conversion_count,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4867 nr, max_size, discard);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4868 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4869 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4870
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4871 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4872 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4873 uint32_t tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4874 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	4875 data_index, conversion_count,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4876 nr, max_size, discard);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4877 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4878 break;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4879 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4880 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4881 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4882
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4883 case 'e': case 'f': case 'g':
27382 9354d33dfbc4 accept 'E' and 'G' as scanf conversion specifiers (bug #56869) John W. Eaton <jwe@octave.org> parents: 27301 diff changeset	4884 case 'E': case 'G':
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4885 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4886 double tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4887
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4888 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	4889 data_index, conversion_count,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4890 nr, max_size, discard);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4891 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4892 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4893
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4894 case 'c':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4895 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4896 BEGIN_C_CONVERSION ();
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 FINISH_CHARACTER_CONVERSION ();
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 is.setf (flags);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4901 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4902 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4903
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4904 case 's':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4905 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4906 BEGIN_S_CONVERSION ();
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 FINISH_CHARACTER_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4909 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4910 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4911
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4912 case '[': case '^':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4913 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4914 BEGIN_CHAR_CLASS_CONVERSION ();
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 FINISH_CHARACTER_CONVERSION ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	4917 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4918 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4919
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4920 case 'p':
27136 512399fefc1b Call error() function from base_stream in the correct manner. Rik <rik@octave.org> parents: 27132 diff changeset	4921 error (who, "unsupported format specifier");
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4922 break;
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 default:
27136 512399fefc1b Call error() function from base_stream in the correct manner. Rik <rik@octave.org> parents: 27132 diff changeset	4925 error (who, "internal format error");
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4926 break;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4929 if (! ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4930 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4931 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4932 }
27137 30f53f7a7293 Return correct error messages on octave-streams when scanf fails (bug #56396) Rik <rik@octave.org> parents: 27136 diff changeset	4933 else if (is.eof () \|\| ! is)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4934 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4935 if (all_char_conv)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4936 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4937 if (one_elt_size_spec)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4938 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4939 final_nr = 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4940 final_nc = data_index;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4941 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4942 else if (data_index > nr)
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 final_nr = nr;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4945 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	4946 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4947 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4948 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4949 final_nr = data_index;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4950 final_nc = 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4951 }
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 else if (nr > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4954 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4955 if (data_index > nr)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4956 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4957 final_nr = nr;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4958 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	4959 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4960 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4961 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4962 final_nr = data_index;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4963 final_nc = 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4964 }
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 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4967 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4968 final_nr = data_index;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4969 final_nc = 1;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4972 // 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	4973 // 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	4974 if (is.rdstate () & std::ios::failbit)
27137 30f53f7a7293 Return correct error messages on octave-streams when scanf fails (bug #56396) Rik <rik@octave.org> parents: 27136 diff changeset	4975 {
30f53f7a7293 Return correct error messages on octave-streams when scanf fails (bug #56396) Rik <rik@octave.org> parents: 27136 diff changeset	4976 error (who, "format failed to match");
30f53f7a7293 Return correct error messages on octave-streams when scanf fails (bug #56396) Rik <rik@octave.org> parents: 27136 diff changeset	4977 is.clear (is.rdstate () & (~std::ios::failbit));
30f53f7a7293 Return correct error messages on octave-streams when scanf fails (bug #56396) Rik <rik@octave.org> parents: 27136 diff changeset	4978 }
23059 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 // FIXME: is this the right thing to do?
27301 a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27279 diff changeset	4981 if (interp.interactive ()
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	4982 && ! application::forced_interactive ()
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4983 && name () == "stdin")
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4984 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4985 is.clear ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4986
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4987 // Skip to end of line.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4988 bool err;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4989 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	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 break;
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 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4996 {
27136 512399fefc1b Call error() function from base_stream in the correct manner. Rik <rik@octave.org> parents: 27132 diff changeset	4997 error (who, "internal format error");
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	4998 break;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5001 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	5002 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5003 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	5004 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5005 final_nr = 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5006 final_nc = data_index;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5007 }
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 final_nr = nr;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5011 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	5012 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5013
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5014 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5015 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5016 else
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 // 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	5019 // 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	5020 // 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	5021 // specified limit).
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5022 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	5023 && (max_conv == 0
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5024 \|\| conversion_count < max_conv));
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 }
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
27137 30f53f7a7293 Return correct error messages on octave-streams when scanf fails (bug #56396) Rik <rik@octave.org> parents: 27136 diff changeset	5029 mval.resize (final_nr, final_nc, 0.0);
30f53f7a7293 Return correct error messages on octave-streams when scanf fails (bug #56396) Rik <rik@octave.org> parents: 27136 diff changeset	5030
30f53f7a7293 Return correct error messages on octave-streams when scanf fails (bug #56396) Rik <rik@octave.org> parents: 27136 diff changeset	5031 retval = mval;
30f53f7a7293 Return correct error messages on octave-streams when scanf fails (bug #56396) Rik <rik@octave.org> parents: 27136 diff changeset	5032
30f53f7a7293 Return correct error messages on octave-streams when scanf fails (bug #56396) Rik <rik@octave.org> parents: 27136 diff changeset	5033 if (all_char_conv)
30f53f7a7293 Return correct error messages on octave-streams when scanf fails (bug #56396) Rik <rik@octave.org> parents: 27136 diff changeset	5034 retval = retval.convert_to_str (false, true);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5035
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5036 return retval;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5039 octave_value
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5040 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	5041 octave_idx_type& conversion_count,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5042 const std::string& who)
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 octave_value retval = Matrix ();
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 conversion_count = 0;
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 std::istream *isp = input_stream ();
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 if (! isp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5051 invalid_operation (who, "reading");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5052 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5053 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5054 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	5055
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5056 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	5057 ::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	5058
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5059 octave_idx_type nr = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5060 octave_idx_type nc = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5061
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5062 bool one_elt_size_spec;
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 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	5065
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5066 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	5067 conversion_count, who);
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5070 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5071 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5072
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5073 bool
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5074 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	5075 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	5076 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5077 std::istream *isp = input_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5078
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5079 if (! isp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5080 return false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5081
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5082 bool quit = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5083
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5084 std::istream& is = *isp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5085
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5086 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	5087
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5088 if (elt)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5089 {
24753 ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	5090 std::string fmt = elt->text;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5091
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5092 bool discard = elt->discard;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5093
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5094 switch (elt->type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5095 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5096 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	5097 DO_WHITESPACE_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5098 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5099
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5100 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	5101 DO_LITERAL_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5102 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5103
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5104 case '%':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5105 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5106 DO_PCT_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5107
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5108 if (! is)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5109 quit = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5110 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5111 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5112
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5113 case 'd': case 'i':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5114 {
23965 6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5115 switch (elt->modifier)
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 case 'h':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 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 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	5120 if (octave_scan (is, *elt, &tmp))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5121 {
23965 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 (! discard)
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5123 retval = tmp;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5124 }
23965 6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5125 else
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5126 quit = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5127 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5128 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5129
23965 6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5130 case 'l':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5131 {
23965 6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5132 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	5133 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	5134 {
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 (! discard)
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5136 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	5137 }
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5138 else
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5139 quit = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5140 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5141 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5142
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5143 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	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 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	5146 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	5147 {
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 (! discard)
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5149 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	5150 }
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5151 else
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5152 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	5153 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5154 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5155 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5156 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5157 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5158
27385 9a59876c1c4c accept 'X' as scanf conversion specifier (bug #56869) Mike Miller <mtmiller@octave.org> parents: 27382 diff changeset	5159 case 'o': case 'u': case 'x': case 'X':
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5160 {
23965 6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5161 switch (elt->modifier)
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	5162 {
23965 6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5163 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	5164 {
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5165 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	5166 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	5167 {
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5168 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	5169 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	5170 }
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5171 else
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5172 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	5173 }
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5174 break;
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5175
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5176 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	5177 {
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5178 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	5179 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	5180 {
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5181 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	5182 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	5183 }
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5184 else
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5185 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	5186 }
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5187 break;
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5188
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5189 default:
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5190 {
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5191 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	5192 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	5193 {
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5194 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	5195 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	5196 }
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5197 else
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5198 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	5199 }
6f0c2963674b allow large ints to be read by C-style scanf (bug #51794) John W. Eaton <jwe@octave.org> parents: 23824 diff changeset	5200 break;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5201 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5202 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5203 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5204
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5205 case 'e': case 'f': case 'g':
27382 9354d33dfbc4 accept 'E' and 'G' as scanf conversion specifiers (bug #56869) John W. Eaton <jwe@octave.org> parents: 27301 diff changeset	5206 case 'E': case 'G':
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	5207 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5208 double tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5209
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5210 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	5211 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5212 if (! discard)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5213 retval = tmp;
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	5214 }
a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	5215 else
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5216 quit = true;
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	5217 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5218 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5219
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5220 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	5221 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5222 BEGIN_C_CONVERSION ();
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 (! discard)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5225 retval = tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5226
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5227 if (! is)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5228 quit = true;
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 is.setf (flags);
10187 a44d15813a39 don't skip literal text elements in scanf formats John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	5231 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5232 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5233
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5234 case 's':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5235 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5236 BEGIN_S_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5237
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5238 if (! discard)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5239 retval = tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5240
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5241 if (! is)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5242 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	5243 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5244 break;
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 case '[':
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5247 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	5248 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5249 BEGIN_CHAR_CLASS_CONVERSION ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5250
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5251 if (! discard)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5252 retval = tmp;
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 if (! is)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5255 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	5256 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5257 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5258
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5259 case 'p':
27136 512399fefc1b Call error() function from base_stream in the correct manner. Rik <rik@octave.org> parents: 27132 diff changeset	5260 error (who, "unsupported format specifier");
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5261 break;
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 default:
27136 512399fefc1b Call error() function from base_stream in the correct manner. Rik <rik@octave.org> parents: 27132 diff changeset	5264 error (who, "internal format error");
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5265 break;
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 }
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 if (ok () && is.fail ())
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 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	5272
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5273 // 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	5274
27301 a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27279 diff changeset	5275 interpreter& interp = __get_interpreter__ ("base_stream::do_oscanf");
a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27279 diff changeset	5276
a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27279 diff changeset	5277 if (interp.interactive () && ! application::forced_interactive ()
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5278 && name () == "stdin")
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5279 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5280 // Skip to end of line.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5281 bool err;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5282 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	5283 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5284 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5285
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5286 return quit;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5289 octave_value_list
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5290 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	5291 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5292 octave_value_list retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5293
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5294 std::istream *isp = input_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5295
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5296 if (! isp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5297 invalid_operation (who, "reading");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5298 else
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 std::istream& is = *isp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5301
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5302 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	5303
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5304 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	5305
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5306 if (nconv == -1)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5307 ::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	5308
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5309 is.clear ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5310
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5311 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	5312
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5313 retval.resize (nconv+2, Matrix ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5314
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5315 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	5316
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5317 int num_values = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5318
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5319 bool quit = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5320
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5321 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	5322 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5323 octave_value tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5324
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5325 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	5326
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5327 if (quit)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5328 break;
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5329 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5330 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5331 if (tmp.is_defined ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5332 retval(num_values++) = tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5333
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5334 if (! ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5335 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5336
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5337 elt = fmt_list.next (nconv > 0);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5338 }
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5339 }
23059 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 retval(nconv) = num_values;
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 int err_num;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5344 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	5345
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5346 if (! quit)
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5347 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5348 // Pick up any trailing stuff.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5349 if (ok () && len > nconv)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5350 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5351 octave_value tmp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5352
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5353 elt = fmt_list.next ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5354
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5355 do_oscanf (elt, tmp, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5356 }
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5357 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5358 }
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 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5361 }
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 octave_value
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5364 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	5365 octave_idx_type ntimes,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5366 const octave_value_list& options,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5367 const std::string& who,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5368 octave_idx_type& read_count)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5369 {
27301 a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27279 diff changeset	5370 interpreter& interp = __get_interpreter__ ("base_stream::do_textscan");
a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27279 diff changeset	5371
a2b1ba6c92d5 eliminate unnecessary application::interative function John W. Eaton <jwe@octave.org> parents: 27279 diff changeset	5372 if (interp.interactive () && file_number () == 0)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5373 ::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	5374 who.c_str ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5375
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5376 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	5377
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5378 std::istream *isp = input_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5379
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5380 if (! isp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5381 invalid_operation (who, "reading");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5382 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5383 {
26706 ccea3574f36b Support encoding of file streams in textscan (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26705 diff changeset	5384 textscan scanner (who, encoding ());
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5385
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5386 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	5387 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5388
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5389 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5390 }
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 // 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	5393 // (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	5394
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5395 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5396 base_stream::flush (void)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5397 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5398 int retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5399
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5400 std::ostream *os = output_stream ();
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 if (! os)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5403 invalid_operation ("fflush", "writing");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5404 else
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 os->flush ();
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 if (os->good ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5409 retval = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5410 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5411
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5412 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5413 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5414
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5415 class
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5416 printf_value_cache
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5417 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5418 public:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5419
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5420 enum state { ok, conversion_error };
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 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	5423 : 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	5424 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	5425 curr_state (ok)
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5426 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5427 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	5428 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5429 octave_value val = values(i);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5430
23587 0c468af9dc00 maint: Deprecate is_object and replace with isobject. Rik <rik@octave.org> parents: 23584 diff changeset	5431 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	5432 err_wrong_type_arg (who, val);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5433 }
2215 ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5434 }
ab0e1fd337f5 [project @ 1996-05-16 15:56:40 by jwe] jwe parents: 2213 diff changeset	5435
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5436 // No copying!
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5437
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5438 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	5439
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5440 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	5441
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5442 ~printf_value_cache (void) = default;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5443
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5444 // 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	5445 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	5446
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5447 // 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	5448 int int_value (void);
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 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	5451
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5452 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	5453
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5454 private:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5455
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5456 const octave_value_list values;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5457 int val_idx;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5458 int elt_idx;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5459 int n_vals;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5460 int n_elts;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5461 bool have_data;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5462 octave_value curr_val;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5463 state curr_state;
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 // 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	5466
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5467 printf_value_cache (void);
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5470 octave_value
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5471 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	5472 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5473 octave_value retval;
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 (exhausted ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5476 curr_state = conversion_error;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5477
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5478 while (! exhausted ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5479 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5480 if (! have_data)
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5481 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5482 curr_val = values (val_idx);
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 elt_idx = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5485 n_elts = curr_val.numel ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5486 have_data = true;
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5487 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5488
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5489 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	5490 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5491 if (type == 's')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5492 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5493 if (curr_val.is_string ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5494 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5495 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	5496 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	5497
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5498 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	5499
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5500 retval = sval.substr (elt_idx);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5501
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5502 // 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	5503 elt_idx = n_elts;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5504 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5505 else
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 // 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	5508 // 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	5509 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	5510
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5511 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	5512
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5513 for (; idx < n_elts; idx++)
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 double dval = val(idx);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5516
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	5517 if (math::x_nint (dval) != dval \|\| dval < 0 \|\| dval > 255)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5518 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5519 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5520
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5521 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	5522
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5523 if (n > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5524 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5525 std::string sval (n, '\0');
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 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	5528 sval[i] = val(elt_idx++);
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 retval = sval;
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 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5533 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	5534 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10293 diff changeset	5535 }
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5536 else
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5537 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5538 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	5539
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5540 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	5541 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5542 double dval = retval.double_value ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5543
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	5544 if (math::x_nint (dval) == dval && dval >= 0 && dval < 256)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5545 retval = static_cast<char> (dval);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5546 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5547 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5548
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5549 if (elt_idx >= n_elts)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5550 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5551 elt_idx = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5552 val_idx++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5553 have_data = false;
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
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 diff changeset	5556 break;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5557 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5558 else
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 val_idx++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5561 have_data = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5562
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5563 if (n_elts == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5564 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5565 if (elt_idx == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5566 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5567 if (type == 's' \|\| type == 'c')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5568 retval = "";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5569 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5570 retval = Matrix ();
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 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5573 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5574
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5575 if (exhausted ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5576 curr_state = conversion_error;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5577 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5578 }
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;
7352 fab9bc33b949 [project @ 2008-01-07 18:54:45 by jwe] jwe parents: 7227 diff changeset	5582 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	5583
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5584 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5585 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	5586 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5587 int retval = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5588
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5589 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	5590
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5591 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	5592
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	5593 if (math::x_nint (dval) == dval)
389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	5594 retval = math::nint (dval);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5595 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5596 curr_state = conversion_error;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5597
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5598 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5599 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5600
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5601 // Ugh again and again.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5602
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5603 template <typename T>
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5604 int
27279 1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5605 do_printf_conv (std::ostream& os, const std::string& encoding,
1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5606 const char *fmt, int nsa, int sa_1, int sa_2, T arg,
1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5607 const std::string& who)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5608 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5609 int retval = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5610
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5611 switch (nsa)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5612 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5613 case 2:
27279 1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5614 retval = format (os, encoding, fmt, sa_1, sa_2, arg);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5615 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5616
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5617 case 1:
27279 1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5618 retval = format (os, encoding, fmt, sa_1, arg);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5619 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5620
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5621 case 0:
27279 1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5622 retval = format (os, encoding, fmt, arg);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5623 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5624
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5625 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5626 ::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	5627 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5628 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5629
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5630 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5631 }
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5632
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5633 static size_t
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	5634 do_printf_string (std::ostream& os, const printf_format_elt *elt,
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5635 int nsa, int sa_1, int sa_2, const std::string& arg,
26703 29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26640 diff changeset	5636 const std::string& encoding, const std::string& who)
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5637 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5638 if (nsa > 2)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5639 ::error ("%s: internal error handling format", who.c_str ());
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5640
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5641 std::string flags = elt->flags;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5642
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5643 bool left = flags.find ('-') != std::string::npos;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5644
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5645 size_t len = arg.length ();
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5646
26703 29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26640 diff changeset	5647 size_t prec = (nsa > 1 ? sa_2 : (elt->prec == -1 ? len : elt->prec));
29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26640 diff changeset	5648
29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26640 diff changeset	5649 std::string print_str = prec < arg.length () ? arg.substr (0, prec) : arg;
29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26640 diff changeset	5650 if (encoding.compare ("utf-8"))
29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26640 diff changeset	5651 {
29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26640 diff changeset	5652 size_t src_len = print_str.length ();
29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26640 diff changeset	5653 print_str = string::u8_to_encoding (who, print_str, encoding);
29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26640 diff changeset	5654 len -= src_len - print_str.length ();
29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26640 diff changeset	5655 }
29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26640 diff changeset	5656
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5657 size_t fw = (nsa > 0 ? sa_1 : (elt->fw == -1 ? len : elt->fw));
26703 29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26640 diff changeset	5658
29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26640 diff changeset	5659 os << std::setw (fw) << (left ? std::left : std::right) << print_str;
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5660
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5661 return len > fw ? len : fw;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5662 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5663
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5664 static bool
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5665 is_nan_or_inf (const octave_value& val)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5666 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5667 octave_value ov_isnan = val.isnan ();
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5668 octave_value ov_isinf = val.isinf ();
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5669
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5670 return (ov_isnan.is_true () \|\| ov_isinf.is_true ());
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5671 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5672
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5673 static bool
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5674 ok_for_signed_int_conv (const octave_value& val)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5675 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5676 uint64_t limit = std::numeric_limits<int64_t>::max ();
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5677
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5678 if (val.is_string ())
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5679 return true;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5680 else if (val.isinteger ())
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5681 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5682 if (val.is_uint64_type ())
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5683 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5684 octave_uint64 ival = val.uint64_scalar_value ();
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5685
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5686 if (ival.value () <= limit)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5687 return true;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5688 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5689 else
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5690 return true;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5691 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5692 else
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5693 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5694 double dval = val.double_value (true);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5695
26415 f553b02e13c6 Use "x == fix (x)" to detect integers rather than floor or round (bug #55347). Rik <rik@octave.org> parents: 26411 diff changeset	5696 if (dval == math::fix (dval) && dval <= limit)
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5697 return true;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5698 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5699
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5700 return false;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5701 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5702
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5703 static bool
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5704 ok_for_unsigned_int_conv (const octave_value& val)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5705 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5706 if (val.is_string ())
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5707 return true;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5708 else if (val.isinteger ())
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5709 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5710 // Easier than dispatching here...
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5711
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5712 octave_value ov_is_ge_zero
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5713 = do_binary_op (octave_value::op_ge, val, octave_value (0.0));
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5714
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5715 return ov_is_ge_zero.is_true ();
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5716 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5717 else
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5718 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5719 double dval = val.double_value (true);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5720
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5721 uint64_t limit = std::numeric_limits<uint64_t>::max ();
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5722
26415 f553b02e13c6 Use "x == fix (x)" to detect integers rather than floor or round (bug #55347). Rik <rik@octave.org> parents: 26411 diff changeset	5723 if (dval == math::fix (dval) && dval >= 0 && dval <= limit)
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5724 return true;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5725 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5726
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5727 return false;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5728 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5729
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5730 static std::string
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	5731 switch_to_g_format (const printf_format_elt *elt)
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5732 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5733 std::string tfmt = elt->text;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5734
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5735 tfmt.replace (tfmt.rfind (elt->type), 1, "g");
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5736
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5737 return tfmt;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5738 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	5739
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5740 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5741 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	5742 const printf_format_elt *elt,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5743 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	5744 const octave_value& val,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5745 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5746 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5747 int retval = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5748
24753 ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	5749 std::string tfmt = elt->text;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5750
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5751 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	5752 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5753 double dval = val.double_value ();
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::size_type i1, i2;
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 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	5758
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5759 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	5760 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5761 tfmt.erase (i2, i1-i2);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5762 if (elt->prec == -2)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5763 nsa--;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5764 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5765
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5766 const char *tval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5767 if (lo_ieee_isinf (dval))
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 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	5770 tval = (dval < 0 ? "-Inf" : "+Inf");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5771 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5772 tval = (dval < 0 ? "-Inf" : "Inf");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5773 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5774 else
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 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	5777 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	5778 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5779 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	5780 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5781
27279 1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5782 retval += do_printf_conv (os, encoding (), tfmt.c_str (), nsa, sa_1,
1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5783 sa_2, tval, who);
23059 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 else
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 static std::string llmod
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	5788 = (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	5789
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5790 char type = elt->type;
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 switch (type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5793 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5794 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	5795 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	5796 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5797 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	5798
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5799 // Insert "long" modifier.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5800 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	5801
27279 1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5802 retval += do_printf_conv (os, encoding (), tfmt.c_str (), nsa,
1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5803 sa_1, sa_2, tval.value (), who);
23059 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 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5806 {
24753 ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	5807 tfmt = switch_to_g_format (elt);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5808
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5809 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	5810
27279 1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5811 retval += do_printf_conv (os, encoding (), tfmt.c_str (), nsa,
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5812 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	5813 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5814 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5815
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5816 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	5817 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	5818 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5819 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	5820
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5821 // Insert "long" modifier.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5822 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	5823
27279 1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5824 retval += do_printf_conv (os, encoding (), tfmt.c_str (), nsa,
1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5825 sa_1, sa_2, tval.value (), who);
23059 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 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5828 {
24753 ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	5829 tfmt = switch_to_g_format (elt);
23059 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 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	5832
27279 1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5833 retval += do_printf_conv (os, encoding (), tfmt.c_str (), nsa,
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5834 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	5835 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5836 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5837
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5838 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	5839 case 'g': case 'G':
9701 531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	5840 {
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5841 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	5842
27279 1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5843 retval += do_printf_conv (os, encoding (), tfmt.c_str (), nsa,
1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5844 sa_1, sa_2, dval, who);
9701 531280b07625 implement fskipl Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	5845 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5846 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5847
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5848 default:
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	5849 // 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	5850 // This error does not halt execution so "return ..." must exist.
27136 512399fefc1b Call error() function from base_stream in the correct manner. Rik <rik@octave.org> parents: 27132 diff changeset	5851 error (who, "invalid format specifier");
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5852 return -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5853 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5854 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5855 }
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 return retval;
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 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5861 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	5862 const octave_value_list& args,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5863 const std::string& who)
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 int retval = 0;
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 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	5868
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5869 std::ostream *osp = output_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5870
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5871 if (! osp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5872 invalid_operation (who, "writing");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5873 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5874 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5875 std::ostream& os = *osp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5876
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5877 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	5878
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5879 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	5880
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5881 for (;;)
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 octave_quit ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5884
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5885 if (! elt)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5886 ::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	5887
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5888 // 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	5889 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	5890
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5891 int sa_1 = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5892 int sa_2 = 0;
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 (nsa > 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5895 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5896 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	5897
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5898 if (! val_cache)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5899 break;
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 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5902 if (nsa > 1)
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 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	5905
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5906 if (! val_cache)
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 }
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->type == '%')
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5913 {
27279 1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5914 if (encoding ().compare ("utf-8"))
1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5915 os << string::u8_to_encoding (who, "%", encoding ());
1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5916 else
1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5917 os << '%';
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5918 retval++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5919 }
24753 ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	5920 else if (elt->args == 0 && ! elt->text.empty ())
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5921 {
27279 1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5922 if (encoding ().compare ("utf-8"))
1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5923 os << string::u8_to_encoding (who, elt->text, encoding ());
1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5924 else
1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5925 os << elt->text;
24753 ca6a73be15da allow NUL characters in printf and scanf formats (bug #53148) John W. Eaton <jwe@octave.org> parents: 24752 diff changeset	5926 retval += (elt->text.length ());
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5927 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5928 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	5929 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5930 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	5931
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5932 if (val_cache)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5933 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5934 if (val.is_string ())
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 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	5937
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5938 retval += do_printf_string (os, elt, nsa, sa_1,
26703 29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26640 diff changeset	5939 sa_2, sval, encoding (),
29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26640 diff changeset	5940 who);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5941 }
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 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	5944 sa_2, val, who);
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 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5947 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5948 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5949 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5950 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5951 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	5952
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5953 if (val_cache)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5954 {
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	5955 if (! val.isempty ())
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5956 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	5957 sa_2, val, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5958 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5959 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5960 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5961 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5962
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5963 if (! os)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5964 {
27136 512399fefc1b Call error() function from base_stream in the correct manner. Rik <rik@octave.org> parents: 27132 diff changeset	5965 error (who, "write error");
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5966 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5967 }
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 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	5970
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5971 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	5972 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5973 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5974 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5975
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5976 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5977 }
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 int
27279 1c8b20731af4 Convert encoding just before writing to stream (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 27277 diff changeset	5980 base_stream::printf (const std::string& fmt,
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5981 const octave_value_list& args,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5982 const std::string& who)
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 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	5985
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5986 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	5987 ::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	5988
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5989 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	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 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5993 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	5994 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5995 int retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5996
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	5997 std::ostream *osp = output_stream ();
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 if (! osp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6000 invalid_operation (who, "writing");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6001 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6002 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6003 std::ostream& os = *osp;
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 os << s;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6006
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6007 if (! os)
27136 512399fefc1b Call error() function from base_stream in the correct manner. Rik <rik@octave.org> parents: 27132 diff changeset	6008 error (who, "write error");
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6009 else
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 // 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	6012 // 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	6013 //
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6014 // 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	6015 //
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6016 // 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	6017 os.flush ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6018
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6019 if (os)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6020 retval = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6021 else
27136 512399fefc1b Call error() function from base_stream in the correct manner. Rik <rik@octave.org> parents: 27132 diff changeset	6022 error (who, "write error");
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6023 }
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 retval;
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 // 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	6030
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6031 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6032 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	6033 {
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	6034 err_num = (m_fail ? -1 : 0);
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	6035
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	6036 std::string tmp = m_errmsg;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6037
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6038 if (clear_err)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6039 clear ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6040
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6041 return tmp;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6044 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6045 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	6046 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6047 // 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	6048 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	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 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6052 stream::flush (void)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6053 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6054 int retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6055
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6056 if (stream_ok ())
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	6057 retval = m_rep->flush ();
23059 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 return retval;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6062 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6063 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	6064 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6065 std::string retval;
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 if (stream_ok ())
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	6068 retval = m_rep->getl (max_len, err, who);
23059 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 return retval;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6073 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6074 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	6075 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6076 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6077 err = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6078
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6079 int conv_err = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6080
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6081 int max_len = -1;
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 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	6084 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6085 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	6086
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6087 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	6088 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6089 err = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6090 ::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	6091 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6092 }
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 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	6095 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6096
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6097 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6098 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	6099 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6100 std::string retval;
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 if (stream_ok ())
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	6103 retval = m_rep->gets (max_len, err, who);
23059 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 return retval;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6108 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6109 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	6110 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6111 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6112 err = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6113
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6114 int conv_err = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6115
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6116 int max_len = -1;
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 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	6119 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6120 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	6121
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6122 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	6123 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6124 err = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6125 ::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	6126 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6127 }
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 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	6130 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6131
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6132 off_t
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6133 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	6134 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6135 off_t retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6136
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6137 if (stream_ok ())
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	6138 retval = m_rep->skipl (count, err, who);
23059 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 return retval;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6143 off_t
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6144 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	6145 const std::string& who)
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 err = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6148
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6149 int conv_err = 0;
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 count = 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6152
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6153 if (tc_count.is_defined ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6154 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6155 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	6156 && 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	6157 count = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6158 else
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 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	6161
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6162 if (conv_err \|\| count < 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6163 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6164 err = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6165 ::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	6166 }
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 }
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 return skipl (count, err, who);
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6173 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6174 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	6175 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6176 int status = -1;
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 if (stream_ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6179 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6180 clearerr ();
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 // Find current position so we can return to it if needed.
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	6183 off_t orig_pos = m_rep->tell ();
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6184
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6185 // Move to end of file. If successful, find the offset of the end.
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	6186 status = m_rep->seek (0, SEEK_END);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6187
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6188 if (status == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6189 {
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	6190 off_t eof_pos = m_rep->tell ();
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6191
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6192 if (origin == SEEK_CUR)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6193 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6194 // 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	6195 // 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	6196 // location.
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	6197 m_rep->seek (orig_pos, SEEK_SET);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6198 }
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 // 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	6201 // existing file.
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	6202 status = m_rep->seek (offset, origin);
23059 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 if (status == 0)
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 // Where are we after moving to desired position?
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	6207 off_t desired_pos = m_rep->tell ();
23059 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 // 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	6210 // but we'll check anyway...
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6211 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	6212 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6213 // Seek outside bounds of file.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6214 // Failure should leave position unchanged.
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	6215 m_rep->seek (orig_pos, SEEK_SET);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6216
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6217 status = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6218 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6219 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6220 else
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 // 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	6223 // Move back to original position and return failure status.
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	6224 m_rep->seek (orig_pos, SEEK_SET);
23059 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 status = -1;
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 }
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6231 return status;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6232 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6233
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6234 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6235 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	6236 const octave_value& tc_origin)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6237 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6238 int retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6239
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6240 // 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	6241 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	6242 off_t xoffset = val.value ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6243
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6244 int conv_err = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6245
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6246 int origin = SEEK_SET;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6247
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6248 if (tc_origin.is_string ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6249 {
26364 2398d2cc3d70 oct-stream.cc: Fix static analyzer detected V601 issue (bug #55347) Andreas Weber <octave@josoansi.de> parents: 26164 diff changeset	6250 std::string xorigin = tc_origin.xstring_value ("fseek: invalid value for origin");
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6251
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6252 if (xorigin == "bof")
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6253 origin = SEEK_SET;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6254 else if (xorigin == "cof")
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6255 origin = SEEK_CUR;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6256 else if (xorigin == "eof")
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6257 origin = SEEK_END;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6258 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6259 conv_err = -1;
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 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6262 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6263 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	6264
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6265 if (! conv_err)
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 if (xorigin == -1)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6268 origin = SEEK_SET;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6269 else if (xorigin == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6270 origin = SEEK_CUR;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6271 else if (xorigin == 1)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6272 origin = SEEK_END;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6273 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6274 conv_err = -1;
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 }
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 if (conv_err)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6279 ::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	6280
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6281 retval = seek (xoffset, origin);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6282
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6283 if (retval != 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6284 // 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	6285 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	6286
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6287 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6288 }
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 off_t
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6291 stream::tell (void)
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 off_t retval = -1;
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 if (stream_ok ())
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	6296 retval = m_rep->tell ();
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6297
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6298 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6299 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6300
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6301 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6302 stream::rewind (void)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6303 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6304 return seek (0, SEEK_SET);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6305 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6306
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6307 bool
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6308 stream::is_open (void) const
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6309 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6310 bool retval = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6311
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6312 if (stream_ok ())
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	6313 retval = m_rep->is_open ();
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6314
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6315 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6316 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6317
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6318 void
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6319 stream::close (void)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6320 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6321 if (stream_ok ())
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	6322 m_rep->close ();
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6323 }
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6324
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6325 // FIXME: maybe these should be defined in lo-ieee.h?
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6326
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6327 template <typename T>
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6328 static inline bool
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6329 is_old_NA (T)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6330 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6331 return false;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6332 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6333
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6334 template <>
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6335 inline bool
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6336 is_old_NA<double> (double val)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6337 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6338 return __lo_ieee_is_old_NA (val);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6339 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6340
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6341 template <typename T>
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6342 static inline T
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6343 replace_old_NA (T val)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6344 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6345 return val;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6346 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6347
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6348 template <>
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6349 inline double
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6350 replace_old_NA<double> (double val)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6351 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6352 return __lo_ieee_replace_old_NA (val);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6353 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6354
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6355 template <typename SRC_T, typename DST_T>
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6356 static octave_value
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6357 convert_and_copy (std::list<void *>& input_buf_list,
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6358 octave_idx_type input_buf_elts,
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6359 octave_idx_type elts_read,
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6360 octave_idx_type nr, octave_idx_type nc, bool swap,
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6361 bool do_float_fmt_conv, bool do_NA_conv,
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	6362 mach_info::float_format from_flt_fmt)
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6363 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6364 typedef typename DST_T::element_type dst_elt_type;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6365
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6366 DST_T conv (dim_vector (nr, nc));
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6367
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6368 dst_elt_type *conv_data = conv.fortran_vec ();
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6369
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6370 octave_idx_type j = 0;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6371
25343 4d7790d9793f use cbegin, crbegin, cend, and crend and auto decls where possible John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	6372 for (auto it = input_buf_list.cbegin (); it != input_buf_list.cend (); it++)
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6373 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6374 SRC_T data = static_cast<SRC_T > (*it);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6375
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6376 if (swap \|\| do_float_fmt_conv)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6377 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6378 if (do_NA_conv)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6379 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6380 for (octave_idx_type i = 0; i < input_buf_elts && j < elts_read;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6381 i++, j++)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6382 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6383 if (swap)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6384 swap_bytes<sizeof (SRC_T)> (&data[i]);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6385 else if (do_float_fmt_conv)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6386 do_float_format_conversion (&data[i], sizeof (SRC_T),
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6387 1, from_flt_fmt,
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	6388 mach_info::native_float_format ());
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6389
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6390 dst_elt_type tmp (data[i]);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6391
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6392 if (is_old_NA (tmp))
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6393 tmp = replace_old_NA (tmp);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6394
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6395 conv_data[j] = tmp;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6396 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6397 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6398 else
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6399 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6400 for (octave_idx_type i = 0; i < input_buf_elts && j < elts_read;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6401 i++, j++)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6402 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6403 if (swap)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6404 swap_bytes<sizeof (SRC_T)> (&data[i]);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6405 else if (do_float_fmt_conv)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6406 do_float_format_conversion (&data[i], sizeof (SRC_T),
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6407 1, from_flt_fmt,
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	6408 mach_info::native_float_format ());
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6409
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6410 conv_data[j] = data[i];
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6411 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6412 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6413 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6414 else
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6415 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6416 if (do_NA_conv)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6417 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6418 for (octave_idx_type i = 0; i < input_buf_elts && j < elts_read;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6419 i++, j++)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6420 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6421 dst_elt_type tmp (data[i]);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6422
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6423 if (is_old_NA (tmp))
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6424 tmp = replace_old_NA (tmp);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6425
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6426 conv_data[j] = tmp;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6427 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6428 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6429 else
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6430 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6431 for (octave_idx_type i = 0; i < input_buf_elts && j < elts_read;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6432 i++, j++)
21335 e078d2208d86 avoid warnings about implicit float to booll conversions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	6433 conv_data[j] = data[i];
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6434 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6435 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6436
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6437 delete [] data;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6438 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6439
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6440 input_buf_list.clear ();
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6441
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6442 for (octave_idx_type i = elts_read; i < nr * nc; i++)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6443 conv_data[i] = dst_elt_type (0);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6444
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6445 return conv;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6446 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6447
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6448 typedef octave_value (*conv_fptr)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6449 (std::list<void *>& input_buf_list, octave_idx_type input_buf_elts,
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6450 octave_idx_type elts_read, octave_idx_type nr, octave_idx_type nc,
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6451 bool swap, bool do_float_fmt_conv, bool do_NA_conv,
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	6452 mach_info::float_format from_flt_fmt);
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6453
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6454 #define TABLE_ELT(T, U, V, W) \
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6455 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	6456
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6457 #define FILL_TABLE_ROW(T, V) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6458 TABLE_ELT (T, dt_int8, V, int8NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6459 TABLE_ELT (T, dt_uint8, V, uint8NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6460 TABLE_ELT (T, dt_int16, V, int16NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6461 TABLE_ELT (T, dt_uint16, V, uint16NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6462 TABLE_ELT (T, dt_int32, V, int32NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6463 TABLE_ELT (T, dt_uint32, V, uint32NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6464 TABLE_ELT (T, dt_int64, V, int64NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6465 TABLE_ELT (T, dt_uint64, V, uint64NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6466 TABLE_ELT (T, dt_single, V, FloatNDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6467 TABLE_ELT (T, dt_double, V, NDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6468 TABLE_ELT (T, dt_char, V, charNDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6469 TABLE_ELT (T, dt_schar, V, charNDArray); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	6470 TABLE_ELT (T, dt_uchar, V, charNDArray); \
17453 669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6471 TABLE_ELT (T, dt_logical, V, boolNDArray);
669ad11f282d improve efficiency of fread John W. Eaton <jwe@octave.org> parents: 17416 diff changeset	6472
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6473 octave_value
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6474 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	6475 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	6476 octave_idx_type elts_read,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6477 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	6478 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	6479 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	6480 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	6481 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6482 octave_value retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6483
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6484 static bool initialized = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6485
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6486 // 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	6487
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6488 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	6489
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6490 if (! initialized)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6491 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6492 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	6493 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	6494 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	6495
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6496 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	6497 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	6498 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	6499 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	6500 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	6501 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	6502 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	6503 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	6504 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	6505 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	6506 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	6507 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	6508 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	6509 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	6510
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6511 initialized = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6512 }
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 bool swap = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6515
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6516 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	6517 ffmt = float_format ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6518
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6519 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	6520 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	6521 else
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6522 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	6523
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6524 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	6525 \|\| 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	6526 && ffmt != float_format ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6527
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6528 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	6529
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6530 switch (output_type)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6531 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6532 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	6533 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	6534 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	6535 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	6536 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	6537 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	6538 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	6539 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	6540 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	6541 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	6542 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	6543 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	6544 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	6545 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	6546 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6547 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	6548
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6549 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	6550 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	6551 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6552 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6553
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6554 default:
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6555 ::error ("read: invalid type specification");
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
20931 69dcb58b9ada Clean up use of error() versus ::error() in stream-based code. Rik <rik@octave.org> parents: 20917 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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6561 octave_value
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6562 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	6563 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	6564 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	6565 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	6566 octave_idx_type& count)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6567 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6568 octave_value retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6569
25658 0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6570 if (! stream_ok ())
0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6571 return retval;
0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6572
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6573 octave_idx_type nr = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6574 octave_idx_type nc = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6575
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6576 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	6577
25658 0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6578 // FIXME: We may eventually want to make this extensible.
0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6579
0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6580 // FIXME: We need a better way to ensure that this numbering stays
0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6581 // consistent with the order of the elements in the data_type enum in the
0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6582 // oct_data_conv class.
23059 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 // 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	6585 size_t char_count = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6586
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6587 ptrdiff_t tmp_count = 0;
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 try
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6590 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6591 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	6592 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6593 catch (const execution_exception&)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6594 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6595 invalid_operation ("fread", "reading");
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 return retval;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6600 if (one_elt_size_spec)
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 NR == 0, Matlab returns [](0x0).
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6603
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6604 // 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	6605 // number of rows.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6606
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6607 // 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	6608 // 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	6609
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6610 if (nr == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6611 nr = nc = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6612 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6613 nc = 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6614 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6615 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6616 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6617 // 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	6618 // specification and one is nonzero.
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 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	6621 // should be.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6622
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6623 if (nr == 0 \|\| nc == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6624 nr = nc = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6625 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6626
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6627 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	6628
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6629 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	6630
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6631 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	6632
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6633 if (skip == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6634 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6635 if (read_to_eof)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6636 input_buf_elts = 1024 * 1024;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6637 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6638 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	6639 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6640 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6641 input_buf_elts = block_size;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6642
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6643 octave_idx_type input_elt_size
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	6644 = oct_data_conv::data_type_size (input_type);
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	6645
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27216 diff changeset	6646 ptrdiff_t input_buf_size
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27216 diff changeset	6647 = static_cast<ptrdiff_t> (input_buf_elts) * input_elt_size;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6648
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6649 assert (input_buf_size >= 0);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6650
25658 0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6651 // Must also work and return correct type object for 0 elements to read.
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6652 std::istream *isp = input_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6653
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6654 if (! isp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6655 error ("fread: invalid input stream");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6656 else
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 std::istream& is = *isp;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6659
25650 336267b16a3d Improve fread speed by 2.5X when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25646 diff changeset	6660 // Initialize eof_pos variable just once per function call
336267b16a3d Improve fread speed by 2.5X when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25646 diff changeset	6661 off_t eof_pos = 0;
25658 0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6662 off_t cur_pos = 0;
25650 336267b16a3d Improve fread speed by 2.5X when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25646 diff changeset	6663 if (skip != 0 && is && ! is.eof ())
336267b16a3d Improve fread speed by 2.5X when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25646 diff changeset	6664 {
25658 0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6665 cur_pos = is.tellg ();
25657 db326f3aacf4 Improve fread speed by a further 2.5X when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25650 diff changeset	6666 is.seekg (0, is.end);
db326f3aacf4 Improve fread speed by a further 2.5X when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25650 diff changeset	6667 eof_pos = is.tellg ();
25658 0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6668 is.seekg (cur_pos, is.beg);
25650 336267b16a3d Improve fread speed by 2.5X when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25646 diff changeset	6669 }
336267b16a3d Improve fread speed by 2.5X when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25646 diff changeset	6670
25658 0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6671 std::list<void *> input_buf_list;
23059 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 while (is && ! is.eof ()
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6674 && (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	6675 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6676 if (! read_to_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 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	6679
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6680 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	6681 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	6682 }
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 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	6685
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6686 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	6687
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6688 size_t gcount = is.gcount ();
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 char_count += gcount;
25658 0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6691 cur_pos += gcount;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6692
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6693 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	6694
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6695 tmp_count += nel;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6696
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6697 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	6698
25658 0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6699 if (skip != 0 && nel == block_size && is)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6700 {
25650 336267b16a3d Improve fread speed by 2.5X when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25646 diff changeset	6701 // Attempt to skip.
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6702 // If skip would move past EOF, position at EOF.
25658 0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6703 off_t remaining = eof_pos - cur_pos;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6704
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6705 if (remaining < skip)
25658 0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6706 {
0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6707 is.seekg (0, is.end);
0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6708 cur_pos = eof_pos;
0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6709 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6710 else
25658 0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6711 {
0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6712 is.seekg (skip, is.cur);
0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6713 cur_pos += skip;
0812413a0bb7 Improve fread speed by a further 40% when SKIP parameter used (bug #54100). Rik <rik@octave.org> parents: 25657 diff changeset	6714 }
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6715 }
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6718 if (read_to_eof)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6719 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6720 if (nc < 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6721 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6722 nc = tmp_count / nr;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6723
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6724 if (tmp_count % nr != 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6725 nc++;
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 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6728 nr = tmp_count;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6729 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6730 else if (tmp_count == 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6731 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6732 nr = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6733 nc = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6734 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6735 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	6736 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6737 if (tmp_count % nr != 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6738 nc = tmp_count / nr + 1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6739 else
22996 36df0e0072a5 distinguish elements vs. bytes in fread (bug #49699) John W. Eaton <jwe@octave.org> parents: 22407 diff changeset	6740 nc = tmp_count / nr;
36df0e0072a5 distinguish elements vs. bytes in fread (bug #49699) John W. Eaton <jwe@octave.org> parents: 22407 diff changeset	6741
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6742 if (tmp_count < nr)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6743 nr = tmp_count;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6746 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	6747 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	6748 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6749 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	6750
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6751 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	6752 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	6753 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6754
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6755 return retval;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6758 octave_idx_type
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6759 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	6760 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	6761 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	6762 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6763 octave_idx_type retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6764
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6765 if (! stream_ok ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6766 invalid_operation ("fwrite", "writing");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6767 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6768 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	6769 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	6770 flt_fmt = float_format ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6771
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6772 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	6773 skip, flt_fmt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6774
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6775 if (status < 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6776 error ("fwrite: write error");
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6777 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6778 retval = status;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6779 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6780
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6781 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6782 }
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6783
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6784 template <typename T, typename V>
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6785 static void
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6786 convert_chars (const void data, void conv_data, octave_idx_type n_elts)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6787 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6788 const T tt_data = static_cast<const T > (data);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6789
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6790 V vt_data = static_cast<V > (conv_data);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6791
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6792 for (octave_idx_type i = 0; i < n_elts; i++)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6793 vt_data[i] = tt_data[i];
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6794 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6795
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6796 template <typename T, typename V>
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6797 static void
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6798 convert_ints (const T data, void conv_data, octave_idx_type n_elts,
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6799 bool swap)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6800 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6801 typedef typename V::val_type val_type;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6802
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6803 val_type vt_data = static_cast<val_type > (conv_data);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6804
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6805 for (octave_idx_type i = 0; i < n_elts; i++)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6806 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6807 // Yes, we want saturation semantics when converting to an integer type.
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6808 V val (data[i]);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6809
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6810 vt_data[i] = val.value ();
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6811
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6812 if (swap)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6813 swap_bytes<sizeof (val_type)> (&vt_data[i]);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6814 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6815 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6816
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6817 template <typename T>
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6818 class ultimate_element_type
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6819 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6820 public:
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6821 typedef T type;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6822 };
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6823
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6824 template <typename T>
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6825 class ultimate_element_type<octave_int<T>>
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6826 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6827 public:
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6828 typedef T type;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6829 };
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6830
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6831 template <typename T>
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6832 static bool
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6833 convert_data (const T data, void conv_data, octave_idx_type n_elts,
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6834 oct_data_conv::data_type output_type,
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	6835 mach_info::float_format flt_fmt)
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6836 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6837 bool retval = true;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6838
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6839 bool swap = false;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6840
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	6841 if (mach_info::words_big_endian ())
389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	6842 swap = (flt_fmt == mach_info::flt_fmt_ieee_little_endian);
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6843 else
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	6844 swap = (flt_fmt == mach_info::flt_fmt_ieee_big_endian);
389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	6845
389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	6846 bool do_float_conversion = flt_fmt != mach_info::float_format ();
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6847
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6848 typedef typename ultimate_element_type<T>::type ult_elt_type;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6849
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6850 switch (output_type)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6851 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6852 case oct_data_conv::dt_char:
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6853 convert_chars<ult_elt_type, char> (data, conv_data, n_elts);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6854 break;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6855
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6856 case oct_data_conv::dt_schar:
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6857 convert_chars<ult_elt_type, signed char> (data, conv_data, n_elts);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6858 break;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6859
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6860 case oct_data_conv::dt_uchar:
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6861 convert_chars<ult_elt_type, unsigned char> (data, conv_data, n_elts);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6862 break;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6863
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6864 case oct_data_conv::dt_int8:
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6865 convert_ints<T, octave_int8> (data, conv_data, n_elts, swap);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6866 break;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6867
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6868 case oct_data_conv::dt_uint8:
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6869 convert_ints<T, octave_uint8> (data, conv_data, n_elts, swap);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6870 break;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6871
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6872 case oct_data_conv::dt_int16:
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6873 convert_ints<T, octave_int16> (data, conv_data, n_elts, swap);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6874 break;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6875
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6876 case oct_data_conv::dt_uint16:
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6877 convert_ints<T, octave_uint16> (data, conv_data, n_elts, swap);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6878 break;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6879
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6880 case oct_data_conv::dt_int32:
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6881 convert_ints<T, octave_int32> (data, conv_data, n_elts, swap);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6882 break;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6883
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6884 case oct_data_conv::dt_uint32:
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6885 convert_ints<T, octave_uint32> (data, conv_data, n_elts, swap);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6886 break;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6887
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6888 case oct_data_conv::dt_int64:
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6889 convert_ints<T, octave_int64> (data, conv_data, n_elts, swap);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6890 break;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6891
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6892 case oct_data_conv::dt_uint64:
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6893 convert_ints<T, octave_uint64> (data, conv_data, n_elts, swap);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6894 break;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6895
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6896 case oct_data_conv::dt_single:
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6897 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6898 float vt_data = static_cast<float > (conv_data);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6899
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6900 for (octave_idx_type i = 0; i < n_elts; i++)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6901 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6902 vt_data[i] = data[i];
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6903
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6904 if (do_float_conversion)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6905 do_float_format_conversion (&vt_data[i], 1, flt_fmt);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6906 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6907 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6908 break;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6909
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6910 case oct_data_conv::dt_double:
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6911 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6912 double vt_data = static_cast<double > (conv_data);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6913
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6914 for (octave_idx_type i = 0; i < n_elts; i++)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6915 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6916 vt_data[i] = data[i];
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6917
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6918 if (do_float_conversion)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6919 do_double_format_conversion (&vt_data[i], 1, flt_fmt);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6920 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6921 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6922 break;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6923
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6924 default:
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6925 ::error ("write: invalid type specification");
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6926 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6927
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6928 return retval;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6929 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	6930
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6931 bool
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6932 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	6933 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6934 bool status = false;
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 std::ostream *osp = output_stream ();
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 if (osp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6939 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6940 std::ostream& os = *osp;
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 if (os)
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 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	6945
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6946 if (os)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6947 status = true;
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 }
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 return status;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6952 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6953
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6954 bool
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6955 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	6956 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6957 bool status = false;
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 std::ostream *osp = output_stream ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6960
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6961 if (! osp)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6962 return false;
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 std::ostream& os = *osp;
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 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	6967 // Otherwise, write NUL to skip.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6968 off_t orig_pos = tell ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6969
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6970 seek (0, SEEK_END);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6971
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6972 off_t eof_pos = tell ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6973
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6974 // 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	6975 seek (orig_pos, SEEK_SET);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6976
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6977 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	6978
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6979 if (remaining < skip)
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 seek (0, SEEK_END);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6982
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6983 // 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	6984 unsigned char zero = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6985 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	6986 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	6987 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6988 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6989 seek (skip, SEEK_CUR);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6990
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6991 if (os)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6992 status = true;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6993
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6994 return status;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6997 template <typename T>
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6998 octave_idx_type
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	6999 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	7000 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	7001 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	7002 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	7003 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7004 bool swap = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7005
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	7006 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	7007 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	7008 else
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	7009 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	7010
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7011 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	7012 \|\| 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	7013
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7014 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	7015
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7016 octave_idx_type chunk_size;
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 != 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7019 chunk_size = block_size;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7020 else if (do_data_conversion)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7021 chunk_size = 1024 * 1024;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7022 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7023 chunk_size = nel;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7024
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7025 octave_idx_type i = 0;
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 const T *pdata = data.data ();
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 while (i < nel)
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 if (skip != 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7032 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7033 if (! skip_bytes (skip))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7034 return -1;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7037 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	7038
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7039 if (chunk_size > remaining_nel)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7040 chunk_size = remaining_nel;
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 bool status = false;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7043
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7044 if (do_data_conversion)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7045 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7046 size_t output_size
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7047 = 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	7048
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7049 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	7050
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7051 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	7052 output_type, flt_fmt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7053
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7054 if (status)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7055 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	7056 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7057 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7058 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	7059
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7060 if (! status)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7061 return -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7062
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7063 i += chunk_size;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7064 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7065
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7066 return nel;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7067 }
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4927 diff changeset	7068
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	7069 #define INSTANTIATE_WRITE(T) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	7070 template \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	7071 octave_idx_type \
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7072 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	7073 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	7074 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	7075 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	7076
24476 bb8ae4e9e09d * oct-stream.cc: Fix whitespace in some macro definitions. John W. Eaton <jwe@octave.org> parents: 24346 diff changeset	7077 INSTANTIATE_WRITE (octave_int8);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7078 INSTANTIATE_WRITE (octave_uint8);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7079 INSTANTIATE_WRITE (octave_int16);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7080 INSTANTIATE_WRITE (octave_uint16);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7081 INSTANTIATE_WRITE (octave_int32);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7082 INSTANTIATE_WRITE (octave_uint32);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7083 INSTANTIATE_WRITE (octave_int64);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7084 INSTANTIATE_WRITE (octave_uint64);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7085 INSTANTIATE_WRITE (int8_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7086 INSTANTIATE_WRITE (uint8_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7087 INSTANTIATE_WRITE (int16_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7088 INSTANTIATE_WRITE (uint16_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7089 INSTANTIATE_WRITE (int32_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7090 INSTANTIATE_WRITE (uint32_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7091 INSTANTIATE_WRITE (int64_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7092 INSTANTIATE_WRITE (uint64_t);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7093 INSTANTIATE_WRITE (bool);
21354 06d15e4e611a move public data type macros to octave-config.h John W. Eaton <jwe@octave.org> parents: 21335 diff changeset	7094 #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	7095 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	7096 #endif
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7097 INSTANTIATE_WRITE (float);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7098 INSTANTIATE_WRITE (double);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7099
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7100 octave_value
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7101 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	7102 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	7103 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7104 octave_value retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7105
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7106 if (stream_ok ())
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7107 retval = m_rep->scanf (fmt, size, count, who);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7108
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7109 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7110 }
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 octave_value
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7113 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	7114 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	7115 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7116 octave_value retval = Matrix ();
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 if (fmt.is_string ())
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 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	7121
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7122 if (fmt.is_sq_string ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7123 sfmt = do_string_escapes (sfmt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7124
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7125 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	7126 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7127 else
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 // 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	7130 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	7131 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7132
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7133 return retval;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7136 octave_value_list
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7137 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	7138 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7139 octave_value_list retval;
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 (stream_ok ())
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7142 retval = m_rep->oscanf (fmt, who);
23059 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 return retval;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7147 octave_value_list
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7148 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	7149 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7150 octave_value_list retval;
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 if (fmt.is_string ())
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 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	7155
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7156 if (fmt.is_sq_string ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7157 sfmt = do_string_escapes (sfmt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7158
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7159 retval = oscanf (sfmt, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7160 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7161 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7162 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7163 // 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	7164 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	7165 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7166
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7167 return retval;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7170 octave_value
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7171 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	7172 const octave_value_list& options,
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7173 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	7174 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7175 return (stream_ok ()
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7176 ? m_rep->do_textscan (fmt, ntimes, options, who, count)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7177 : octave_value ());
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7178 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7179
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7180 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7181 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	7182 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7183 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7184 int retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7185
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7186 if (stream_ok ())
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7187 retval = m_rep->printf (fmt, args, who);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7188
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7189 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7190 }
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 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7193 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	7194 const std::string& who)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7195 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7196 int retval = 0;
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 if (fmt.is_string ())
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 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	7201
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7202 if (fmt.is_sq_string ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7203 sfmt = do_string_escapes (sfmt);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7204
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7205 retval = printf (sfmt, args, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7206 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7207 else
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 // 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	7210 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	7211 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7212
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7213 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7214 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7215
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7216 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7217 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	7218 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7219 int retval = -1;
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 if (stream_ok ())
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7222 retval = m_rep->puts (s, who);
23059 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 return retval;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7227 // 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	7228
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7229 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7230 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	7231 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7232 int retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7233
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7234 if (tc_s.is_string ())
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 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	7237 retval = puts (s, who);
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7238 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7239 else
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 // 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	7242 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	7243 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7244
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7245 return retval;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7248 bool
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7249 stream::eof (void) const
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7250 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7251 int retval = -1;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7252
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7253 if (stream_ok ())
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7254 retval = m_rep->eof ();
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7255
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7256 return retval;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7259 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7260 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	7261 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7262 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	7263
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7264 if (stream_ok (false))
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7265 retval = m_rep->error (clear, err_num);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7266
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7267 return retval;
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7270 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7271 stream::name (void) const
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7272 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7273 std::string retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7274
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7275 if (stream_ok ())
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7276 retval = m_rep->name ();
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7277
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7278 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7279 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7280
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7281 int
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7282 stream::mode (void) const
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7283 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7284 int retval = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7285
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7286 if (stream_ok ())
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7287 retval = m_rep->mode ();
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7288
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7289 return retval;
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
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	7292 mach_info::float_format
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7293 stream::float_format (void) const
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7294 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	7295 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	7296
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7297 if (stream_ok ())
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7298 retval = m_rep->float_format ();
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7299
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7300 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7301 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7302
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7303 std::string
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7304 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	7305 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7306 std::string retval = "???";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7307 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	7308
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7309 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	7310 retval = "r";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7311 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	7312 \|\| 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	7313 retval = "w";
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::out \| std::ios::app))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7315 retval = "a";
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))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7317 retval = "r+";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7318 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	7319 retval = "w+";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7320 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	7321 retval = "a+";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7322 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	7323 retval = "rb";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7324 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	7325 \|\| 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	7326 retval = "wb";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7327 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	7328 retval = "ab";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7329 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	7330 retval = "r+b";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7331 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	7332 \| std::ios::binary))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7333 retval = "w+b";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7334 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	7335 \| std::ios::binary))
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7336 retval = "a+b";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7337
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7338 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7339 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7340
25435 a52e6fb674b1 eliminate some singletons and static & global variables John W. Eaton <jwe@octave.org> parents: 25430 diff changeset	7341 stream_list::stream_list (interpreter& interp)
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7342 : m_list (), m_lookup_cache (m_list.end ()), m_stdin_file (-1),
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7343 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	7344 {
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7345 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	7346
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7347 // 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	7348 // 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	7349
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7350 // 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	7351
25435 a52e6fb674b1 eliminate some singletons and static & global variables John W. Eaton <jwe@octave.org> parents: 25430 diff changeset	7352 output_system& output_sys = interp.get_output_system ();
a52e6fb674b1 eliminate some singletons and static & global variables John W. Eaton <jwe@octave.org> parents: 25430 diff changeset	7353
a52e6fb674b1 eliminate some singletons and static & global variables John W. Eaton <jwe@octave.org> parents: 25430 diff changeset	7354 stream stdout_stream
a52e6fb674b1 eliminate some singletons and static & global variables John W. Eaton <jwe@octave.org> parents: 25430 diff changeset	7355 = octave_ostream::create (&(output_sys.__stdout__ ()), "stdout");
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7356
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7357 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	7358
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7359 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	7360 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	7361 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	7362 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7363
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7364 stream_list::~stream_list (void)
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7365 {
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7366 clear ();
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7367 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7368
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7369 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	7370 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7371 // 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	7372
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7373 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	7374
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7375 if (stream_number == -1)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7376 return stream_number;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7377
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7378 // Should we test for
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7379 //
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7380 // (m_list.find (stream_number) != m_list.end ()
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7381 // && m_list[stream_number].is_open ())
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7382 //
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7383 // 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	7384 // 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	7385 // 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	7386 // 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	7387 // 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	7388 // 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	7389 // before.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7390
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7391 if (m_list.size () >= m_list.max_size ())
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7392 ::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	7393
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7394 m_list[stream_number] = os;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7395
6757 c3cd7d14fc5e [project @ 2007-06-25 19:06:42 by jwe] jwe parents: 6708 diff changeset	7396 return stream_number;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7397 }
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	7398
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	7399 OCTAVE_NORETURN static
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	7400 void
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	7401 err_invalid_file_id (int fid, const std::string& who)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	7402 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	7403 if (who.empty ())
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	7404 ::error ("invalid stream number = %d", fid);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	7405 else
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	7406 ::error ("%s: invalid stream number = %d", who.c_str (), fid);
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	7407 }
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	7408
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7409 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	7410 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7411 stream retval;
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 if (fid < 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7414 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	7415
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7416 if (m_lookup_cache != m_list.end () && m_lookup_cache->first == fid)
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7417 retval = m_lookup_cache->second;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7418 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7419 {
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7420 ostrl_map::const_iterator iter = m_list.find (fid);
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7421
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7422 if (iter == m_list.end ())
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7423 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	7424
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7425 retval = iter->second;
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7426 m_lookup_cache = iter;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7427 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7428
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7429 return retval;
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
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7432 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	7433 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	7434 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7435 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	7436
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7437 return lookup (i, who);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7438 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7439
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7440 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	7441 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7442 // 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	7443 if (fid < 3)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7444 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	7445
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7446 auto iter = m_list.find (fid);
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7447
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7448 if (iter == m_list.end ())
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7449 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	7450
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7451 stream os = iter->second;
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7452 m_list.erase (iter);
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7453 m_lookup_cache = m_list.end ();
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7454
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7455 // FIXME: is this check redundant?
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7456 if (! os.is_valid ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7457 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	7458
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7459 os.close ();
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 return 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7462 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7463
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7464 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	7465 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7466 int retval = -1;
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 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	7469 {
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7470 clear (false);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7471
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7472 retval = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7473 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7474 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7475 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7476 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	7477
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7478 retval = remove (i, who);
23059 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
22837 b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7481 return retval;
23059 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
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7484 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	7485 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7486 if (flush)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7487 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7488 // Flush stdout and stderr.
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7489 m_list[1].flush ();
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7490 m_list[2].flush ();
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7491 }
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7492
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7493 for (auto iter = m_list.begin (); iter != m_list.end (); )
23059 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 int fid = iter->first;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7496 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	7497 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7498 iter++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7499 continue;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7500 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7501
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7502 stream os = iter->second;
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 std::string name = os.name ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7505 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	7506
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7507 // 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	7508 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	7509 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7510 // 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	7511 iter++;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7512 continue;
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
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7515 // Normal file handle. Close and delete from m_list.
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7516 if (os.is_valid ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7517 os.close ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7518
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7519 m_list.erase (iter++);
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7520 }
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7521
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7522 m_lookup_cache = m_list.end ();
23059 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
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7525 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	7526 {
26705 c13143821eef Add front-end support for encodings in "fopen" (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26703 diff changeset	7527 string_vector retval (4);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7528
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7529 if (fid < 0)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7530 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7531
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7532 stream os;
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7533 if (m_lookup_cache != m_list.end () && m_lookup_cache->first == fid)
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7534 os = m_lookup_cache->second;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7535 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7536 {
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7537 ostrl_map::const_iterator iter = m_list.find (fid);
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7538
b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7539 if (iter == m_list.end ())
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7540 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7541
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7542 os = iter->second;
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7543 m_lookup_cache = iter;
23059 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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7546 if (! os.is_valid ())
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7547 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7548
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7549 retval(0) = os.name ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7550 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	7551 retval(2) = mach_info::float_format_as_string (os.float_format ());
26705 c13143821eef Add front-end support for encodings in "fopen" (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26703 diff changeset	7552 retval(3) = os.encoding ();
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7553
22837 b125351d4243 Return null "" status when querying a bad FID with fopen (bug #49695). Rik <rik@octave.org> parents: 22812 diff changeset	7554 return retval;
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7555 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7556
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7557 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	7558 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7559 int conv_err = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7560
26640 c18e59476795 file id must not be single for textscan and other file I/O funcs (bug #55577) Mike Miller <mtmiller@octave.org> parents: 26566 diff changeset	7561 if (fid.is_single_type ())
c18e59476795 file id must not be single for textscan and other file I/O funcs (bug #55577) Mike Miller <mtmiller@octave.org> parents: 26566 diff changeset	7562 ::error ("file id must be a file object or integer value");
c18e59476795 file id must not be single for textscan and other file I/O funcs (bug #55577) Mike Miller <mtmiller@octave.org> parents: 26566 diff changeset	7563
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7564 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	7565
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7566 if (conv_err)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7567 ::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	7568
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7569 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	7570 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7571
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7572 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	7573 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7574 std::ostringstream buf;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7575
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7576 buf << "\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7577 << " number mode arch name\n"
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7578 << " ------ ---- ---- ----\n";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7579
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7580 for (const auto& fid_strm : m_list)
23059 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 stream os = fid_strm.second;
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 buf << " "
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7585 << std::setiosflags (std::ios::right)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7586 << std::setw (4) << fid_strm.first << " "
19123 c8f03ccdc9ee Align columns for freport() output. Rik <rik@octave.org> parents: 18676 diff changeset	7587 // 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	7588 << std::resetiosflags (std::ios::adjustfield)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7589 << std::setiosflags (std::ios::left)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7590 << std::setw (3)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7591 << 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	7592 << " "
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7593 << 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	7594 << 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	7595 << " "
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7596 << os.name () << "\n";
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
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7599 buf << "\n";
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7600
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7601 return buf.str ();
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7602 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7603
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7604 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	7605 {
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7606 Matrix retval (1, m_list.size (), 0.0);
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7607
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7608 int num_open = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7609
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7610 for (const auto& fid_strm : m_list)
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7611 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7612 // Skip stdin, stdout, and stderr.
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7613 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	7614 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	7615 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7616
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7617 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	7618
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7619 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7620 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7621
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7622 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	7623 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7624 int retval = -1;
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 if (fid.is_string ())
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 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	7629
27172 b0abae0bd94b style fixes John W. Eaton <jwe@octave.org> parents: 27137 diff changeset	7630 for (const auto& fid_strm : m_list)
23059 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 // 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	7633 if (fid_strm.first > 2)
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 stream os = fid_strm.second;
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 if (os && os.name () == nm)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7638 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7639 retval = fid_strm.first;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7640 break;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7641 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7642 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7643 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7644 }
26640 c18e59476795 file id must not be single for textscan and other file I/O funcs (bug #55577) Mike Miller <mtmiller@octave.org> parents: 26566 diff changeset	7645 else if (fid.is_single_type ())
c18e59476795 file id must not be single for textscan and other file I/O funcs (bug #55577) Mike Miller <mtmiller@octave.org> parents: 26566 diff changeset	7646 ::error ("file id must be a file object, std::string, or integer value");
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7647 else
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7648 {
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7649 int conv_err = 0;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7650
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7651 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	7652
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7653 if (conv_err)
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7654 ::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	7655
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7656 retval = int_fid;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7657 }
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7658
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7659 return retval;
b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22997 diff changeset	7660 }
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7661
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7662 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	7663 {
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7664 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	7665 }
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7666
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7667 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	7668 {
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7669 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	7670 }
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7671
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7672 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	7673 {
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	7674 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	7675 }
2117 b240b2fce8ed [project @ 1996-05-10 07:20:36 by jwe] jwe parents: diff changeset	7676 }

Mercurial > octave

annotate libinterp/corefcn/oct-stream.cc @ 27735:8600f5ea1ec1