Mercurial > octave
annotate liboctave/util/lo-utils.cc @ 25438:cb1606f78f6b
prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible
Using <iostream> brings with it a static initializer for the std::cin,
std::cout, and std::cerr streams. In most cases they are not needed
and should be avoided if possible.
Files affected:
build-aux/mk-opts.pl
libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp
libinterp/corefcn/__dsearchn__.cc
libinterp/corefcn/c-file-ptr-stream.cc
libinterp/corefcn/c-file-ptr-stream.h
libinterp/corefcn/daspk.cc
libinterp/corefcn/dasrt.cc
libinterp/corefcn/dassl.cc
libinterp/corefcn/defaults.cc
libinterp/corefcn/defun.cc
libinterp/corefcn/file-io.cc
libinterp/corefcn/ft-text-renderer.cc
libinterp/corefcn/gl-render.cc
libinterp/corefcn/help.cc
libinterp/corefcn/ls-ascii-helper.cc
libinterp/corefcn/ls-hdf5.cc
libinterp/corefcn/ls-hdf5.h
libinterp/corefcn/ls-mat-ascii.cc
libinterp/corefcn/ls-mat4.cc
libinterp/corefcn/ls-mat5.cc
libinterp/corefcn/ls-oct-binary.cc
libinterp/corefcn/ls-oct-text.cc
libinterp/corefcn/lsode.cc
libinterp/corefcn/oct-iostrm.cc
libinterp/corefcn/oct-procbuf.cc
libinterp/corefcn/oct-stdstrm.h
libinterp/corefcn/procstream.cc
libinterp/corefcn/procstream.h
libinterp/corefcn/quad.cc
libinterp/corefcn/symscope.h
libinterp/corefcn/symtab.h
libinterp/corefcn/toplev.cc
libinterp/corefcn/urlwrite.cc
libinterp/corefcn/utils.cc
libinterp/corefcn/zfstream.cc
libinterp/dldfcn/__ode15__.cc
libinterp/dldfcn/convhulln.cc
libinterp/octave-value/ov-base-diag.cc
libinterp/octave-value/ov-base-int.cc
libinterp/octave-value/ov-base-mat.cc
libinterp/octave-value/ov-base-scalar.cc
libinterp/octave-value/ov-base-sparse.cc
libinterp/octave-value/ov-base.cc
libinterp/octave-value/ov-bool-mat.cc
libinterp/octave-value/ov-bool-sparse.cc
libinterp/octave-value/ov-bool.cc
libinterp/octave-value/ov-cell.cc
libinterp/octave-value/ov-ch-mat.cc
libinterp/octave-value/ov-class.cc
libinterp/octave-value/ov-colon.cc
libinterp/octave-value/ov-complex.cc
libinterp/octave-value/ov-cs-list.cc
libinterp/octave-value/ov-cx-mat.cc
libinterp/octave-value/ov-cx-sparse.cc
libinterp/octave-value/ov-fcn-handle.cc
libinterp/octave-value/ov-fcn-inline.cc
libinterp/octave-value/ov-float.cc
libinterp/octave-value/ov-flt-complex.cc
libinterp/octave-value/ov-flt-cx-mat.cc
libinterp/octave-value/ov-flt-re-mat.cc
libinterp/octave-value/ov-int16.cc
libinterp/octave-value/ov-int32.cc
libinterp/octave-value/ov-int64.cc
libinterp/octave-value/ov-int8.cc
libinterp/octave-value/ov-java.cc
libinterp/octave-value/ov-range.cc
libinterp/octave-value/ov-re-mat.cc
libinterp/octave-value/ov-re-sparse.cc
libinterp/octave-value/ov-scalar.cc
libinterp/octave-value/ov-str-mat.cc
libinterp/octave-value/ov-struct.cc
libinterp/octave-value/ov-typeinfo.cc
libinterp/octave-value/ov-uint16.cc
libinterp/octave-value/ov-uint32.cc
libinterp/octave-value/ov-uint64.cc
libinterp/octave-value/ov-uint8.cc
libinterp/octave.cc
libinterp/parse-tree/bp-table.cc
libinterp/parse-tree/lex.h
libinterp/parse-tree/profiler.cc
libinterp/parse-tree/pt-arg-list.cc
libinterp/parse-tree/pt-array-list.cc
libinterp/parse-tree/pt-assign.cc
libinterp/parse-tree/pt-cell.cc
libinterp/parse-tree/pt-const.cc
libinterp/parse-tree/pt-eval.cc
libinterp/parse-tree/pt-exp.cc
libinterp/parse-tree/pt-fcn-handle.cc
libinterp/parse-tree/pt-jit.cc
libinterp/parse-tree/pt-pr-code.cc
libinterp/parse-tree/pt-tm-const.cc
libinterp/parse-tree/pt.cc
liboctave/array/Array.cc
liboctave/array/CColVector.cc
liboctave/array/CDiagMatrix.cc
liboctave/array/CMatrix.cc
liboctave/array/CNDArray.cc
liboctave/array/CRowVector.cc
liboctave/array/CSparse.cc
liboctave/array/DiagArray2.cc
liboctave/array/MArray.cc
liboctave/array/Range.cc
liboctave/array/Sparse.cc
liboctave/array/boolMatrix.cc
liboctave/array/boolSparse.cc
liboctave/array/chMatrix.cc
liboctave/array/dColVector.cc
liboctave/array/dDiagMatrix.cc
liboctave/array/dMatrix.cc
liboctave/array/dNDArray.cc
liboctave/array/dRowVector.cc
liboctave/array/dSparse.cc
liboctave/array/fCColVector.cc
liboctave/array/fCDiagMatrix.cc
liboctave/array/fCMatrix.cc
liboctave/array/fCNDArray.cc
liboctave/array/fCRowVector.cc
liboctave/array/fColVector.cc
liboctave/array/fDiagMatrix.cc
liboctave/array/fMatrix.cc
liboctave/array/fNDArray.cc
liboctave/array/fRowVector.cc
liboctave/array/idx-vector.cc
liboctave/numeric/CollocWt.cc
liboctave/numeric/eigs-base.cc
liboctave/system/file-ops.cc
liboctave/system/oct-time.cc
liboctave/util/cmd-hist.cc
liboctave/util/data-conv.cc
liboctave/util/data-conv.h
liboctave/util/file-info.cc
liboctave/util/lo-utils.cc
liboctave/util/lo-utils.h
liboctave/util/quit.cc
liboctave/util/str-vec.cc
liboctave/util/url-transfer.cc
liboctave/util/url-transfer.h
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 07 Jun 2018 10:11:54 -0400 |
parents | 6652d3823428 |
children | 31c0bb386bcd |
rev | line source |
---|---|
1967 | 1 /* |
2 | |
25054
6652d3823428
maint: Update copyright dates in all source files.
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
3 Copyright (C) 1996-2018 John W. Eaton |
1967 | 4 |
5 This file is part of Octave. | |
6 | |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24026
diff
changeset
|
7 Octave is free software: you can redistribute it and/or modify it |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22402
diff
changeset
|
8 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:
24026
diff
changeset
|
9 the Free Software Foundation, either version 3 of the License, or |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22402
diff
changeset
|
10 (at your option) any later version. |
1967 | 11 |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22402
diff
changeset
|
12 Octave is distributed in the hope that it will be useful, but |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22402
diff
changeset
|
13 WITHOUT ANY WARRANTY; without even the implied warranty of |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22402
diff
changeset
|
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22402
diff
changeset
|
15 GNU General Public License for more details. |
1967 | 16 |
17 You should have received a copy of the GNU General Public License | |
7016 | 18 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:
24026
diff
changeset
|
19 <https://www.gnu.org/licenses/>. |
1967 | 20 |
21 */ | |
22 | |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21723
diff
changeset
|
23 #if defined (HAVE_CONFIG_H) |
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21202
diff
changeset
|
24 # include "config.h" |
1967 | 25 #endif |
26 | |
10463
bbe99b2a5ba7
undo recent gnulib-related changes
John W. Eaton <jwe@octave.org>
parents:
10447
diff
changeset
|
27 #include <cstdlib> |
7048 | 28 #include <cstring> |
1967 | 29 |
23443
3f1bf237908b
maint: Eliminate <cfloat.h> header from liboctave files.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
30 #include <complex> |
25438
cb1606f78f6b
prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible
John W. Eaton <jwe@octave.org>
parents:
25054
diff
changeset
|
31 #include <istream> |
6490 | 32 #include <limits> |
25438
cb1606f78f6b
prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible
John W. Eaton <jwe@octave.org>
parents:
25054
diff
changeset
|
33 #include <ostream> |
2926 | 34 #include <string> |
35 | |
10068
ca93f583573d
handle interrupts octave_fgets
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
36 #include "quit.h" |
ca93f583573d
handle interrupts octave_fgets
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
37 |
2926 | 38 #include "lo-error.h" |
4130 | 39 #include "lo-ieee.h" |
1967 | 40 #include "lo-mappers.h" |
41 #include "lo-utils.h" | |
21888
00f1249f2483
create wrappers for some gnulib functions
John W. Eaton <jwe@octave.org>
parents:
21852
diff
changeset
|
42 #include "putenv-wrapper.h" |
1967 | 43 |
11010
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
44 bool xis_int_or_inf_or_nan (double x) |
21782
2aef506f3fec
use namespace for lo-mappers.h functions
John W. Eaton <jwe@octave.org>
parents:
21724
diff
changeset
|
45 { return octave::math::isnan (x) || octave::math::x_nint (x) == x; } |
11010
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
46 |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
47 bool xis_one_or_zero (double x) |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
48 { return x == 0 || x == 1; } |
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_zero (double x) |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
51 { return x == 0; } |
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 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
|
54 { |
23564
7049da1648c0
Deprecate octave::math::finite in favor of octave::math::isfinite.
Rik <rik@octave.org>
parents:
23448
diff
changeset
|
55 return (octave::math::isfinite (x) |
22402
4caa7b28d183
maint: Style check C++ code in liboctave/
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
56 && 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
|
57 } |
11010
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
58 |
15212
4bbd3bbb8912
reduce code duplication in too_large_for_float array functions
John W. Eaton <jwe@octave.org>
parents:
14811
diff
changeset
|
59 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
|
60 { |
4bbd3bbb8912
reduce code duplication in too_large_for_float array functions
John W. Eaton <jwe@octave.org>
parents:
14811
diff
changeset
|
61 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
|
62 || 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
|
63 } |
4bbd3bbb8912
reduce code duplication in too_large_for_float array functions
John W. Eaton <jwe@octave.org>
parents:
14811
diff
changeset
|
64 |
11010
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
65 bool xis_int_or_inf_or_nan (float x) |
21782
2aef506f3fec
use namespace for lo-mappers.h functions
John W. Eaton <jwe@octave.org>
parents:
21724
diff
changeset
|
66 { return octave::math::isnan (x) || octave::math::x_nint (x) == x; } |
11010
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
67 |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
68 bool xis_one_or_zero (float x) |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
69 { return x == 0 || x == 1; } |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
70 |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
71 bool xis_zero (float x) |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
72 { return x == 0; } |
9478b216752e
simplify more array tests
Jaroslav Hajek <highegg@gmail.com>
parents:
10463
diff
changeset
|
73 |
2926 | 74 // Save a string. |
75 | |
76 char * | |
77 strsave (const char *s) | |
78 { | |
79 if (! s) | |
23795
980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents:
23564
diff
changeset
|
80 return nullptr; |
2926 | 81 |
82 int len = strlen (s); | |
83 char *tmp = new char [len+1]; | |
84 tmp = strcpy (tmp, s); | |
85 return tmp; | |
86 } | |
87 | |
17788
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
88 // 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
|
89 // library. |
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
90 |
17861
870f3e12e163
maint: Use phrase "FIXME:" for problem areas in code.
Rik <rik@octave.org>
parents:
17788
diff
changeset
|
91 // 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
|
92 |
2926 | 93 void |
3504 | 94 octave_putenv (const std::string& name, const std::string& value) |
2926 | 95 { |
17788
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
96 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
|
97 |
21444
74b07936fd05
lo-utils.cc: Add note about inevitable memory leak from using putenv.
Rik <rik@octave.org>
parents:
21301
diff
changeset
|
98 // FIXME: This leaks memory, but so would a call to setenv. |
74b07936fd05
lo-utils.cc: Add note about inevitable memory leak from using putenv.
Rik <rik@octave.org>
parents:
21301
diff
changeset
|
99 // Short of extreme measures to track memory, altering the environment |
74b07936fd05
lo-utils.cc: Add note about inevitable memory leak from using putenv.
Rik <rik@octave.org>
parents:
21301
diff
changeset
|
100 // always leaks memory, but the saving grace is that the leaks are small. |
23447
db1fdf4384dd
maint: Use convention "static_cast<void *>" for casting of pointers.
Rik <rik@octave.org>
parents:
23443
diff
changeset
|
101 char *new_item = static_cast<char *> (std::malloc (new_len)); |
17788
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
102 |
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
103 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
|
104 |
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
105 // 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
|
106 // 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
|
107 |
21888
00f1249f2483
create wrappers for some gnulib functions
John W. Eaton <jwe@octave.org>
parents:
21852
diff
changeset
|
108 if (octave_putenv_wrapper (new_item) < 0) |
17788
415583856971
undo 7b305b36b87e to avoid Windows putenv/setenv failure (bug #40381)
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
109 (*current_liboctave_error_handler) ("putenv (%s) failed", new_item); |
2926 | 110 } |
111 | |
3504 | 112 std::string |
2926 | 113 octave_fgets (FILE *f) |
114 { | |
4527 | 115 bool eof; |
116 return octave_fgets (f, eof); | |
117 } | |
118 | |
119 std::string | |
120 octave_fgets (FILE *f, bool& eof) | |
121 { | |
122 eof = false; | |
123 | |
3504 | 124 std::string retval; |
2926 | 125 |
126 int grow_size = 1024; | |
127 int max_size = grow_size; | |
128 | |
21942
aab79a1885cc
limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents:
21888
diff
changeset
|
129 char *buf = static_cast<char *> (std::malloc (max_size)); |
2926 | 130 char *bufptr = buf; |
131 int len = 0; | |
132 | |
133 do | |
134 { | |
21942
aab79a1885cc
limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents:
21888
diff
changeset
|
135 if (std::fgets (bufptr, grow_size, f)) |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
136 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
137 len = strlen (bufptr); |
2926 | 138 |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
139 if (len == grow_size - 1) |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
140 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
141 int tmp = bufptr - buf + grow_size - 1; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
142 grow_size *= 2; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
143 max_size += grow_size; |
21942
aab79a1885cc
limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents:
21888
diff
changeset
|
144 buf = static_cast<char *> (std::realloc (buf, max_size)); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
145 bufptr = buf + tmp; |
2926 | 146 |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
147 if (*(bufptr-1) == '\n') |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
148 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
149 *bufptr = '\0'; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
150 retval = buf; |
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 } |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
153 else if (bufptr[len-1] != '\n') |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
154 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
155 bufptr[len++] = '\n'; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
156 bufptr[len] = '\0'; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
157 retval = buf; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
158 } |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
159 else |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
160 retval = buf; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
161 } |
2926 | 162 else |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
163 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
164 if (len == 0) |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
165 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
166 eof = true; |
4527 | 167 |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
168 free (buf); |
2926 | 169 |
23795
980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents:
23564
diff
changeset
|
170 buf = nullptr; |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
171 } |
2926 | 172 |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
173 break; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
174 } |
2926 | 175 } |
176 while (retval.empty ()); | |
177 | |
23878
889b8262e661
maint: eliminate useless if (p) before free (p)
Mike Miller <mtmiller@octave.org>
parents:
23826
diff
changeset
|
178 free (buf); |
2926 | 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 |
23812
057a894914df
Use C++11 string fcns back() and pop_back() to simplify code.
Rik <rik@octave.org>
parents:
23807
diff
changeset
|
197 if (! retval.empty () && retval.back () == '\n') |
057a894914df
Use C++11 string fcns back() and pop_back() to simplify code.
Rik <rik@octave.org>
parents:
23807
diff
changeset
|
198 retval.pop_back (); |
3970 | 199 |
200 return retval; | |
201 } | |
202 | |
17928
079da800451b
Fix loading complex values with 'NA' saved in text format (bug #40575).
Rik <rik@octave.org>
parents:
17861
diff
changeset
|
203 // 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
|
204 |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
205 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
|
206 T |
14806
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
207 read_inf_nan_na (std::istream& is, char c0) |
4130 | 208 { |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
209 T val = 0.0; |
4130 | 210 |
12995
7872afb42fab
fix scanf problem with reading I (bug #33722)
John W. Eaton <jwe@octave.org>
parents:
12936
diff
changeset
|
211 switch (c0) |
4130 | 212 { |
213 case 'i': case 'I': | |
214 { | |
12995
7872afb42fab
fix scanf problem with reading I (bug #33722)
John W. Eaton <jwe@octave.org>
parents:
12936
diff
changeset
|
215 char c1 = is.get (); |
7872afb42fab
fix scanf problem with reading I (bug #33722)
John W. Eaton <jwe@octave.org>
parents:
12936
diff
changeset
|
216 if (c1 == 'n' || c1 == 'N') |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
217 { |
12995
7872afb42fab
fix scanf problem with reading I (bug #33722)
John W. Eaton <jwe@octave.org>
parents:
12936
diff
changeset
|
218 char c2 = is.get (); |
7872afb42fab
fix scanf problem with reading I (bug #33722)
John W. Eaton <jwe@octave.org>
parents:
12936
diff
changeset
|
219 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
|
220 val = std::numeric_limits<T>::infinity (); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
221 else |
14806
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
222 is.setstate (std::ios::failbit); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
223 } |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
224 else |
14806
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
225 is.setstate (std::ios::failbit); |
4130 | 226 } |
227 break; | |
228 | |
229 case 'n': case 'N': | |
230 { | |
12995
7872afb42fab
fix scanf problem with reading I (bug #33722)
John W. Eaton <jwe@octave.org>
parents:
12936
diff
changeset
|
231 char c1 = is.get (); |
7872afb42fab
fix scanf problem with reading I (bug #33722)
John W. Eaton <jwe@octave.org>
parents:
12936
diff
changeset
|
232 if (c1 == 'a' || c1 == 'A') |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
233 { |
12995
7872afb42fab
fix scanf problem with reading I (bug #33722)
John W. Eaton <jwe@octave.org>
parents:
12936
diff
changeset
|
234 char c2 = is.get (); |
7872afb42fab
fix scanf problem with reading I (bug #33722)
John W. Eaton <jwe@octave.org>
parents:
12936
diff
changeset
|
235 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
|
236 val = std::numeric_limits<T>::quiet_NaN (); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
237 else |
17928
079da800451b
Fix loading complex values with 'NA' saved in text format (bug #40575).
Rik <rik@octave.org>
parents:
17861
diff
changeset
|
238 { |
21723
bae585228161
use namespace for numeric_limits
John W. Eaton <jwe@octave.org>
parents:
21444
diff
changeset
|
239 val = octave::numeric_limits<T>::NA (); |
21184
3db899f1d54c
use istream::traits_type::eof () instead of EOF
John W. Eaton <jwe@octave.org>
parents:
20148
diff
changeset
|
240 if (c2 != std::istream::traits_type::eof ()) |
20148
4a41b7d426b6
Fix loading of ASCII files with NA values in final column (bug #44967).
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
241 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
|
242 } |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
243 } |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
244 else |
14806
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
245 is.setstate (std::ios::failbit); |
4130 | 246 } |
247 break; | |
248 | |
249 default: | |
23448
e1c02e7126a9
avoid calling abort if possible; include cstdlib for declaration if needed
John W. Eaton <jwe@octave.org>
parents:
23447
diff
changeset
|
250 (*current_liboctave_error_handler) ("read_inf_nan_na: invalid character '%c'"); |
4130 | 251 } |
252 | |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
253 return val; |
4130 | 254 } |
255 | |
12936
b74cb659e757
accept but discard sign when reading NA and NaN values
John W. Eaton <jwe@octave.org>
parents:
12918
diff
changeset
|
256 // 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
|
257 |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
258 template <typename T> |
4130 | 259 double |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
260 octave_read_fp_value (std::istream& is) |
4130 | 261 { |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
262 T val = 0.0; |
4130 | 263 |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
264 // 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
|
265 // reading from a file. |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
266 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
|
267 |
6907 | 268 char c1 = ' '; |
4130 | 269 |
6907 | 270 while (isspace (c1)) |
271 c1 = is.get (); | |
272 | |
14806
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
273 bool neg = false; |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
274 |
6194 | 275 switch (c1) |
4130 | 276 { |
6194 | 277 case '-': |
14806
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
278 neg = true; |
23826
d69021d58a61
avoid fallthrough warnings
John W. Eaton <jwe@octave.org>
parents:
23812
diff
changeset
|
279 OCTAVE_FALLTHROUGH; |
6194 | 280 |
281 case '+': | |
282 { | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
283 char c2 = 0; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
284 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
|
285 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
|
286 val = read_inf_nan_na<T> (is, c2); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
287 else |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
288 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
289 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
|
290 is >> val; |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
291 } |
14806
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
292 |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
293 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
|
294 val = -val; |
6194 | 295 } |
296 break; | |
297 | |
4130 | 298 case 'i': case 'I': |
299 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
|
300 val = read_inf_nan_na<T> (is, c1); |
4130 | 301 break; |
302 | |
303 default: | |
6194 | 304 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
|
305 is >> val; |
14806
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
306 break; |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
307 } |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
308 |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
309 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
|
310 if (status & std::ios::failbit) |
980e2d5c83f7
avoid calling putback more than once between reads
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
311 { |
24026
1cb94f46466f
Return Inf/-Inf when reading large numbers from files for Matlab compatibility.
Rik <rik@octave.org>
parents:
23878
diff
changeset
|
312 // Convert MAX_VAL returned by C++ streams for very large numbers to Inf |
1cb94f46466f
Return Inf/-Inf when reading large numbers from files for Matlab compatibility.
Rik <rik@octave.org>
parents:
23878
diff
changeset
|
313 if (val == std::numeric_limits<T>::max ()) |
1cb94f46466f
Return Inf/-Inf when reading large numbers from files for Matlab compatibility.
Rik <rik@octave.org>
parents:
23878
diff
changeset
|
314 { |
1cb94f46466f
Return Inf/-Inf when reading large numbers from files for Matlab compatibility.
Rik <rik@octave.org>
parents:
23878
diff
changeset
|
315 if (neg) |
1cb94f46466f
Return Inf/-Inf when reading large numbers from files for Matlab compatibility.
Rik <rik@octave.org>
parents:
23878
diff
changeset
|
316 val = -std::numeric_limits<T>::infinity (); |
1cb94f46466f
Return Inf/-Inf when reading large numbers from files for Matlab compatibility.
Rik <rik@octave.org>
parents:
23878
diff
changeset
|
317 else |
1cb94f46466f
Return Inf/-Inf when reading large numbers from files for Matlab compatibility.
Rik <rik@octave.org>
parents:
23878
diff
changeset
|
318 val = std::numeric_limits<T>::infinity (); |
1cb94f46466f
Return Inf/-Inf when reading large numbers from files for Matlab compatibility.
Rik <rik@octave.org>
parents:
23878
diff
changeset
|
319 is.clear (status & ~std::ios::failbit); |
1cb94f46466f
Return Inf/-Inf when reading large numbers from files for Matlab compatibility.
Rik <rik@octave.org>
parents:
23878
diff
changeset
|
320 } |
1cb94f46466f
Return Inf/-Inf when reading large numbers from files for Matlab compatibility.
Rik <rik@octave.org>
parents:
23878
diff
changeset
|
321 else |
1cb94f46466f
Return Inf/-Inf when reading large numbers from files for Matlab compatibility.
Rik <rik@octave.org>
parents:
23878
diff
changeset
|
322 { |
1cb94f46466f
Return Inf/-Inf when reading large numbers from files for Matlab compatibility.
Rik <rik@octave.org>
parents:
23878
diff
changeset
|
323 // True error. Reset stream to original position and pass status on. |
1cb94f46466f
Return Inf/-Inf when reading large numbers from files for Matlab compatibility.
Rik <rik@octave.org>
parents:
23878
diff
changeset
|
324 is.clear (); |
1cb94f46466f
Return Inf/-Inf when reading large numbers from files for Matlab compatibility.
Rik <rik@octave.org>
parents:
23878
diff
changeset
|
325 is.seekg (pos); |
1cb94f46466f
Return Inf/-Inf when reading large numbers from files for Matlab compatibility.
Rik <rik@octave.org>
parents:
23878
diff
changeset
|
326 is.setstate (status); |
1cb94f46466f
Return Inf/-Inf when reading large numbers from files for Matlab compatibility.
Rik <rik@octave.org>
parents:
23878
diff
changeset
|
327 } |
4130 | 328 } |
329 | |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
330 return val; |
4130 | 331 } |
332 | |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
333 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
|
334 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
|
335 octave_read_cx_fp_value (std::istream& is) |
4130 | 336 { |
18084
8e056300994b
Follow coding convention of defining and initializing only 1 variable per line in liboctave.
Rik <rik@octave.org>
parents:
17928
diff
changeset
|
337 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
|
338 T im = 0.0; |
4130 | 339 |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
340 std::complex<T> cx = 0.0; |
4130 | 341 |
6907 | 342 char ch = ' '; |
4130 | 343 |
6907 | 344 while (isspace (ch)) |
345 ch = is.get (); | |
4130 | 346 |
347 if (ch == '(') | |
348 { | |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
349 re = octave_read_value<T> (is); |
6897 | 350 ch = is.get (); |
4130 | 351 |
352 if (ch == ',') | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
353 { |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
354 im = octave_read_value<T> (is); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
355 ch = is.get (); |
4130 | 356 |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
357 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
|
358 cx = std::complex<T> (re, im); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
359 else |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
360 is.setstate (std::ios::failbit); |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
361 } |
4130 | 362 else if (ch == ')') |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
363 cx = re; |
4130 | 364 else |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
365 is.setstate (std::ios::failbit); |
4130 | 366 } |
367 else | |
368 { | |
369 is.putback (ch); | |
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
370 cx = octave_read_value<double> (is); |
4130 | 371 } |
372 | |
373 return cx; | |
374 } | |
375 | |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
376 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
|
377 { |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
378 return octave_read_fp_value<double> (is); |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
379 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
380 |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
381 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
|
382 { |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
383 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
|
384 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
385 |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
386 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
|
387 { |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
388 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
|
389 } |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
390 |
14811
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
391 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
|
392 { |
52cb71787cd1
use templates to avoid code duplication in octave_read_value functions
John W. Eaton <jwe@octave.org>
parents:
14806
diff
changeset
|
393 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
|
394 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
395 |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
396 void |
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
397 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
|
398 { |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
399 if (lo_ieee_is_NA (d)) |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
400 os << "NA"; |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
401 else if (lo_ieee_isnan (d)) |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
402 os << "NaN"; |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
403 else if (lo_ieee_isinf (d)) |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
404 os << (d < 0 ? "-Inf" : "Inf"); |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
405 else |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
406 os << d; |
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 |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
409 void |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
410 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
|
411 { |
23807
336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents:
23795
diff
changeset
|
412 os << '('; |
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
413 octave_write_double (os, real (c)); |
23807
336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents:
23795
diff
changeset
|
414 os << ','; |
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
415 octave_write_double (os, imag (c)); |
23807
336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents:
23795
diff
changeset
|
416 os << ')'; |
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
417 } |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
418 |
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
419 void |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
420 octave_write_float (std::ostream& os, float d) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
421 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
422 if (lo_ieee_is_NA (d)) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
423 os << "NA"; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
424 else if (lo_ieee_isnan (d)) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
425 os << "NaN"; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
426 else if (lo_ieee_isinf (d)) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
427 os << (d < 0 ? "-Inf" : "Inf"); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
428 else |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
429 os << d; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
430 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
431 |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
432 void |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
433 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
|
434 { |
23807
336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents:
23795
diff
changeset
|
435 os << '('; |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
436 octave_write_float (os, real (c)); |
23807
336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents:
23795
diff
changeset
|
437 os << ','; |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
438 octave_write_float (os, imag (c)); |
23807
336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents:
23795
diff
changeset
|
439 os << ')'; |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7048
diff
changeset
|
440 } |