Mercurial > octave-antonio
annotate liboctave/util/lo-utils.cc @ 20148:4a41b7d426b6 stable
Fix loading of ASCII files with NA values in final column (bug #44967).
* lo-utils.cc (read_inf_nan_na): Check that last character read was not an EOF
indicator (-1) before attempting to put it back on the stream.
author | Rik <rik@octave.org> |
---|---|
date | Fri, 01 May 2015 08:29:52 -0700 |
parents | 4197fc428c7d |
children |
rev | line source |
---|---|
1993 | 1 // utils.cc |
1967 | 2 /* |
3 | |
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
18084
diff
changeset
|
4 Copyright (C) 1996-2015 John W. Eaton |
1967 | 5 |
6 This file is part of Octave. | |
7 | |
8 Octave is free software; you can redistribute it and/or modify it | |
9 under the terms of the GNU General Public License as published by the | |
7016 | 10 Free Software Foundation; either version 3 of the License, or (at your |
11 option) any later version. | |
1967 | 12 |
13 Octave is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
7016 | 19 along with Octave; see the file COPYING. If not, see |
20 <http://www.gnu.org/licenses/>. | |
1967 | 21 |
22 */ | |
23 | |
24 #ifdef HAVE_CONFIG_H | |
25 #include <config.h> | |
26 #endif | |
27 | |
6907 | 28 #include <cctype> |
10463
bbe99b2a5ba7
undo recent gnulib-related changes
John W. Eaton <jwe@octave.org>
parents:
10447
diff
changeset
|
29 #include <cstdlib> |
2926 | 30 #include <cstdio> |
7048 | 31 #include <cstring> |
11010
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
32 #include <cfloat> |
1967 | 33 |
6490 | 34 #include <limits> |
2926 | 35 #include <string> |
36 | |
37 #include <sys/types.h> | |
38 #include <unistd.h> | |
39 | |
10068
ca93f583573d
handle interrupts octave_fgets
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
40 #include "quit.h" |
ca93f583573d
handle interrupts octave_fgets
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
41 |
2926 | 42 #include "lo-error.h" |
4130 | 43 #include "lo-ieee.h" |
1967 | 44 #include "lo-mappers.h" |
45 #include "lo-utils.h" | |
46 | |
11010
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
47 bool xis_int_or_inf_or_nan (double x) |
11013
63f79f798a14
fix small typos in new tests
Jaroslav Hajek <highegg@gmail.com>
parents:
11010
diff
changeset
|
48 { return xisnan (x) || D_NINT (x) == x; } |
11010
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
49 |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
50 bool xis_one_or_zero (double x) |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
51 { return x == 0 || x == 1; } |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
52 |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
53 bool xis_zero (double x) |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
54 { return x == 0; } |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
55 |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
56 bool xtoo_large_for_float (double x) |
15213
336f42406671
use numeric_limits functions instead of DBL_MIN, DBL_MAX, etc.
John W. Eaton <jwe@octave.org>
parents:
15212
diff
changeset
|
57 { |
16971
259c1f295a1e
Use xfinite to replace some (isinf || isnan) instances in C++ code.
Rik <rik@octave.org>
parents:
15454
diff
changeset
|
58 return (xfinite (x) && fabs (x) > std::numeric_limits<float>::max ()); |
15213
336f42406671
use numeric_limits functions instead of DBL_MIN, DBL_MAX, etc.
John W. Eaton <jwe@octave.org>
parents:
15212
diff
changeset
|
59 } |
11010
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
60 |
15212
4bbd3bbb8912
reduce code duplication in too_large_for_float array functions
John W. Eaton <jwe@octave.org>
parents:
14811
diff
changeset
|
61 bool xtoo_large_for_float (const Complex& x) |
4bbd3bbb8912
reduce code duplication in too_large_for_float array functions
John W. Eaton <jwe@octave.org>
parents:
14811
diff
changeset
|
62 { |
4bbd3bbb8912
reduce code duplication in too_large_for_float array functions
John W. Eaton <jwe@octave.org>
parents:
14811
diff
changeset
|
63 return (xtoo_large_for_float (x.real ()) |
4bbd3bbb8912
reduce code duplication in too_large_for_float array functions
John W. Eaton <jwe@octave.org>
parents:
14811
diff
changeset
|
64 || xtoo_large_for_float (x.imag ())); |
4bbd3bbb8912
reduce code duplication in too_large_for_float array functions
John W. Eaton <jwe@octave.org>
parents:
14811
diff
changeset
|
65 } |
4bbd3bbb8912
reduce code duplication in too_large_for_float array functions
John W. Eaton <jwe@octave.org>
parents:
14811
diff
changeset
|
66 |
11010
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
67 bool xis_int_or_inf_or_nan (float x) |
11013
63f79f798a14
fix small typos in new tests
Jaroslav Hajek <highegg@gmail.com>
parents:
11010
diff
changeset
|
68 { return xisnan (x) || D_NINT (x) == x; } |
11010
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
69 |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
70 bool xis_one_or_zero (float x) |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
71 { return x == 0 || x == 1; } |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
72 |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
73 bool xis_zero (float x) |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
74 { return x == 0; } |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
75 |
2926 | 76 // Save a string. |
77 | |
78 char * | |
79 strsave (const char *s) | |
80 { | |
81 if (! s) | |
82 return 0; | |
83 | |
84 int len = strlen (s); | |
85 char *tmp = new char [len+1]; | |
86 tmp = strcpy (tmp, s); | |
87 return tmp; | |
88 } | |
89 | |
17788
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
90 // This function was adapted from xputenv from Karl Berry's kpathsearch |
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
91 // library. |
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
92 |
17861
870f3e12e163
maint: Use phrase "FIXME:" for problem areas in code.
Rik <rik@octave.org>
parents:
17788
diff
changeset
|
93 // FIXME: make this do the right thing if we don't have a SMART_PUTENV. |
17788
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
94 |
2926 | 95 void |
3504 | 96 octave_putenv (const std::string& name, const std::string& value) |
2926 | 97 { |
17788
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
98 int new_len = name.length () + value.length () + 2; |
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
99 |
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
100 char *new_item = static_cast<char*> (gnulib::malloc (new_len)); |
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
101 |
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
102 sprintf (new_item, "%s=%s", name.c_str (), value.c_str ()); |
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
103 |
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
104 // As far as I can see there's no way to distinguish between the |
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
105 // various errors; putenv doesn't have errno values. |
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
106 |
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
107 if (gnulib::putenv (new_item) < 0) |
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
108 (*current_liboctave_error_handler) ("putenv (%s) failed", new_item); |
2926 | 109 } |
110 | |
3504 | 111 std::string |
2926 | 112 octave_fgets (FILE *f) |
113 { | |
4527 | 114 bool eof; |
115 return octave_fgets (f, eof); | |
116 } | |
117 | |
118 std::string | |
119 octave_fgets (FILE *f, bool& eof) | |
120 { | |
121 eof = false; | |
122 | |
3504 | 123 std::string retval; |
2926 | 124 |
125 int grow_size = 1024; | |
126 int max_size = grow_size; | |
127 | |
10411 | 128 char *buf = static_cast<char *> (gnulib::malloc (max_size)); |
2926 | 129 char *bufptr = buf; |
130 int len = 0; | |
131 | |
132 do | |
133 { | |
12918
f3a8d1efe2c1
use gnulib:: qualifiers for more stdio functions
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
134 if (gnulib::fgets (bufptr, grow_size, f)) |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
135 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
136 len = strlen (bufptr); |
2926 | 137 |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
138 if (len == grow_size - 1) |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
139 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
140 int tmp = bufptr - buf + grow_size - 1; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
141 grow_size *= 2; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
142 max_size += grow_size; |
10411 | 143 buf = static_cast<char *> (gnulib::realloc (buf, max_size)); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
144 bufptr = buf + tmp; |
2926 | 145 |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
146 if (*(bufptr-1) == '\n') |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
147 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
148 *bufptr = '\0'; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
149 retval = buf; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
150 } |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
151 } |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
152 else if (bufptr[len-1] != '\n') |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
153 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
154 bufptr[len++] = '\n'; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
155 bufptr[len] = '\0'; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
156 retval = buf; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
157 } |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
158 else |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
159 retval = buf; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
160 } |
2926 | 161 else |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
162 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
163 if (len == 0) |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
164 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
165 eof = true; |
4527 | 166 |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
167 free (buf); |
2926 | 168 |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
169 buf = 0; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
170 } |
2926 | 171 |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
172 break; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
173 } |
2926 | 174 } |
175 while (retval.empty ()); | |
176 | |
177 if (buf) | |
178 free (buf); | |
179 | |
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
10068
diff
changeset
|
180 octave_quit (); |
10068
ca93f583573d
handle interrupts octave_fgets
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
181 |
2926 | 182 return retval; |
183 } | |
184 | |
3970 | 185 std::string |
186 octave_fgetl (FILE *f) | |
187 { | |
4527 | 188 bool eof; |
189 return octave_fgetl (f, eof); | |
190 } | |
191 | |
192 std::string | |
193 octave_fgetl (FILE *f, bool& eof) | |
194 { | |
195 std::string retval = octave_fgets (f, eof); | |
3970 | 196 |
197 size_t len = retval.length (); | |
198 | |
199 if (retval[len-1] == '\n') | |
200 retval.resize (len-1); | |
201 | |
202 return retval; | |
203 } | |
204 | |
17928
079da800451b
Fix loading complex values with 'NA' saved in text format (bug #40575).
Rik <rik@octave.org>
parents:
17861
diff
changeset
|
205 // Note that the caller is responsible for repositioning the stream on failure. |
14806
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
206 |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
207 template <typename T> |
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
208 T |
14806
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
209 read_inf_nan_na (std::istream& is, char c0) |
4130 | 210 { |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
211 T val = 0.0; |
4130 | 212 |
12995
7872afb42fab
fix scanf problem with reading I (bug #33722)
John W. Eaton <jwe@octave.org>
parents:
12936
diff
changeset
|
213 switch (c0) |
4130 | 214 { |
215 case 'i': case 'I': | |
216 { | |
12995
7872afb42fab
fix scanf problem with reading I (bug #33722)
John W. Eaton <jwe@octave.org>
parents:
12936
diff
changeset
|
217 char c1 = is.get (); |
7872afb42fab
fix scanf problem with reading I (bug #33722)
John W. Eaton <jwe@octave.org>
parents:
12936
diff
changeset
|
218 if (c1 == 'n' || c1 == 'N') |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
219 { |
12995
7872afb42fab
fix scanf problem with reading I (bug #33722)
John W. Eaton <jwe@octave.org>
parents:
12936
diff
changeset
|
220 char c2 = is.get (); |
7872afb42fab
fix scanf problem with reading I (bug #33722)
John W. Eaton <jwe@octave.org>
parents:
12936
diff
changeset
|
221 if (c2 == 'f' || c2 == 'F') |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
222 val = std::numeric_limits<T>::infinity (); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
223 else |
14806
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
224 is.setstate (std::ios::failbit); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
225 } |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
226 else |
14806
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
227 is.setstate (std::ios::failbit); |
4130 | 228 } |
229 break; | |
230 | |
231 case 'n': case 'N': | |
232 { | |
12995
7872afb42fab
fix scanf problem with reading I (bug #33722)
John W. Eaton <jwe@octave.org>
parents:
12936
diff
changeset
|
233 char c1 = is.get (); |
7872afb42fab
fix scanf problem with reading I (bug #33722)
John W. Eaton <jwe@octave.org>
parents:
12936
diff
changeset
|
234 if (c1 == 'a' || c1 == 'A') |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
235 { |
12995
7872afb42fab
fix scanf problem with reading I (bug #33722)
John W. Eaton <jwe@octave.org>
parents:
12936
diff
changeset
|
236 char c2 = is.get (); |
7872afb42fab
fix scanf problem with reading I (bug #33722)
John W. Eaton <jwe@octave.org>
parents:
12936
diff
changeset
|
237 if (c2 == 'n' || c2 == 'N') |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
238 val = std::numeric_limits<T>::quiet_NaN (); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
239 else |
17928
079da800451b
Fix loading complex values with 'NA' saved in text format (bug #40575).
Rik <rik@octave.org>
parents:
17861
diff
changeset
|
240 { |
079da800451b
Fix loading complex values with 'NA' saved in text format (bug #40575).
Rik <rik@octave.org>
parents:
17861
diff
changeset
|
241 val = octave_numeric_limits<T>::NA (); |
20148
4a41b7d426b6
Fix loading of ASCII files with NA values in final column (bug #44967).
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
242 if (c2 != EOF) |
4a41b7d426b6
Fix loading of ASCII files with NA values in final column (bug #44967).
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
243 is.putback (c2); |
17928
079da800451b
Fix loading complex values with 'NA' saved in text format (bug #40575).
Rik <rik@octave.org>
parents:
17861
diff
changeset
|
244 } |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
245 } |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
246 else |
14806
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
247 is.setstate (std::ios::failbit); |
4130 | 248 } |
249 break; | |
250 | |
251 default: | |
252 abort (); | |
253 } | |
254 | |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
255 return val; |
4130 | 256 } |
257 | |
12936
b74cb659e757
accept but discard sign when reading NA and NaN values
John W. Eaton <jwe@octave.org>
parents:
12918
diff
changeset
|
258 // Read a double value. Discard any sign on NaN and NA. |
b74cb659e757
accept but discard sign when reading NA and NaN values
John W. Eaton <jwe@octave.org>
parents:
12918
diff
changeset
|
259 |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
260 template <typename T> |
4130 | 261 double |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
262 octave_read_fp_value (std::istream& is) |
4130 | 263 { |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
264 T val = 0.0; |
4130 | 265 |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
266 // FIXME: resetting stream position is likely to fail unless we are |
14806
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
267 // reading from a file. |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
268 std::ios::streampos pos = is.tellg (); |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
269 |
6907 | 270 char c1 = ' '; |
4130 | 271 |
6907 | 272 while (isspace (c1)) |
273 c1 = is.get (); | |
274 | |
14806
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
275 bool neg = false; |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
276 |
6194 | 277 switch (c1) |
4130 | 278 { |
6194 | 279 case '-': |
14806
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
280 neg = true; |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
281 // fall through... |
6194 | 282 |
283 case '+': | |
284 { | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
285 char c2 = 0; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
286 c2 = is.get (); |
12936
b74cb659e757
accept but discard sign when reading NA and NaN values
John W. Eaton <jwe@octave.org>
parents:
12918
diff
changeset
|
287 if (c2 == 'i' || c2 == 'I' || c2 == 'n' || c2 == 'N') |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
288 val = read_inf_nan_na<T> (is, c2); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
289 else |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
290 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
291 is.putback (c2); |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
292 is >> val; |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
293 } |
14806
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
294 |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
295 if (neg && ! is.fail ()) |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
296 val = -val; |
6194 | 297 } |
298 break; | |
299 | |
4130 | 300 case 'i': case 'I': |
301 case 'n': case 'N': | |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
302 val = read_inf_nan_na<T> (is, c1); |
4130 | 303 break; |
304 | |
305 default: | |
6194 | 306 is.putback (c1); |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
307 is >> val; |
14806
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
308 break; |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
309 } |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
310 |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
311 std::ios::iostate status = is.rdstate (); |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
312 if (status & std::ios::failbit) |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
313 { |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
314 is.clear (); |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
315 is.seekg (pos); |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
316 is.setstate (status); |
4130 | 317 } |
318 | |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
319 return val; |
4130 | 320 } |
321 | |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
322 template <typename T> |
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
323 std::complex<T> |
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
324 octave_read_cx_fp_value (std::istream& is) |
4130 | 325 { |
18084
8e056300994b
Follow coding convention of defining and initializing only 1 variable per line in liboctave.
Rik <rik@octave.org>
parents:
17928
diff
changeset
|
326 T re = 0.0; |
8e056300994b
Follow coding convention of defining and initializing only 1 variable per line in liboctave.
Rik <rik@octave.org>
parents:
17928
diff
changeset
|
327 T im = 0.0; |
4130 | 328 |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
329 std::complex<T> cx = 0.0; |
4130 | 330 |
6907 | 331 char ch = ' '; |
4130 | 332 |
6907 | 333 while (isspace (ch)) |
334 ch = is.get (); | |
4130 | 335 |
336 if (ch == '(') | |
337 { | |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
338 re = octave_read_value<T> (is); |
6897 | 339 ch = is.get (); |
4130 | 340 |
341 if (ch == ',') | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
342 { |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
343 im = octave_read_value<T> (is); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
344 ch = is.get (); |
4130 | 345 |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
346 if (ch == ')') |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
347 cx = std::complex<T> (re, im); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
348 else |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
349 is.setstate (std::ios::failbit); |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
350 } |
4130 | 351 else if (ch == ')') |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
352 cx = re; |
4130 | 353 else |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
354 is.setstate (std::ios::failbit); |
4130 | 355 } |
356 else | |
357 { | |
358 is.putback (ch); | |
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
359 cx = octave_read_value<double> (is); |
4130 | 360 } |
361 | |
362 return cx; | |
363 } | |
364 | |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
365 template <> OCTAVE_API double octave_read_value (std::istream& is) |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
366 { |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
367 return octave_read_fp_value<double> (is); |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
368 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
369 |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
370 template <> OCTAVE_API Complex octave_read_value (std::istream& is) |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
371 { |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
372 return octave_read_cx_fp_value<double> (is); |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
373 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
374 |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
375 template <> OCTAVE_API float octave_read_value (std::istream& is) |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
376 { |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
377 return octave_read_fp_value<float> (is); |
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
378 } |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
379 |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
380 template <> OCTAVE_API FloatComplex octave_read_value (std::istream& is) |
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
381 { |
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
382 return octave_read_cx_fp_value<float> (is); |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
383 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
384 |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
385 void |
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
386 octave_write_double (std::ostream& os, double d) |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
387 { |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
388 if (lo_ieee_is_NA (d)) |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
389 os << "NA"; |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
390 else if (lo_ieee_isnan (d)) |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
391 os << "NaN"; |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
392 else if (lo_ieee_isinf (d)) |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
393 os << (d < 0 ? "-Inf" : "Inf"); |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
394 else |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
395 os << d; |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
396 } |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
397 |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
398 void |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
399 octave_write_complex (std::ostream& os, const Complex& c) |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
400 { |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
401 os << "("; |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
402 octave_write_double (os, real (c)); |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
403 os << ","; |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
404 octave_write_double (os, imag (c)); |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
405 os << ")"; |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
406 } |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
407 |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
408 void |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
409 octave_write_float (std::ostream& os, float d) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
410 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
411 if (lo_ieee_is_NA (d)) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
412 os << "NA"; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
413 else if (lo_ieee_isnan (d)) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
414 os << "NaN"; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
415 else if (lo_ieee_isinf (d)) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
416 os << (d < 0 ? "-Inf" : "Inf"); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
417 else |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
418 os << d; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
419 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
420 |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
421 void |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
422 octave_write_float_complex (std::ostream& os, const FloatComplex& c) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
423 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
424 os << "("; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
425 octave_write_float (os, real (c)); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
426 os << ","; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
427 octave_write_float (os, imag (c)); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
428 os << ")"; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
429 } |