octave: liboctave/util/oct-string.cc annotate

annotate liboctave/util/oct-string.cc @ 27956:2310164737b3 stable

fix many spelling errors (bug #57613)

author	John W. Eaton <jwe@octave.org>
date	Fri, 17 Jan 2020 13:15:27 -0600
parents	00f796120a6d
children	c20b7290c778

rev	line source
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	1 /*
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26192 diff changeset	2 Copyright (C) 2016-2019 Carnë Draug
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	3
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	4 This file is part of Octave.
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	5
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23732 diff changeset	6 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	7 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: 23732 diff changeset	8 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	9 (at your option) any later version.
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	10
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	11 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	12 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	14 GNU General Public License for more details.
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	15
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	16 You should have received a copy of the GNU General Public License
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	17 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: 23732 diff changeset	18 <https://www.gnu.org/licenses/>.
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	19
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	20 */
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	21
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	22 #if defined (HAVE_CONFIG_H)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	23 # include "config.h"
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	24 #endif
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	25
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	26 #include "oct-string.h"
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	27
26110 b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	28 #include <algorithm>
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	29 #include <cctype>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	30 #include <cstring>
26111 3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	31 #include <iomanip>
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	32 #include <string>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	33
23462 314d980bee93 maint: Add '#include "XXX.h"' to XXX.cc files. Rik <rik@octave.org> parents: 23449 diff changeset	34 #include "Array.h"
26111 3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	35 #include "lo-ieee.h"
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	36 #include "lo-mappers.h"
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	37
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	38 template <typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	39 static bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	40 str_data_cmp (const typename T::value_type a, const typename T::value_type b,
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	41 const typename T::size_type n)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	42 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	43 for (typename T::size_type i = 0; i < n; ++i)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	44 if (a[i] != b[i])
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	45 return false;
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	46 return true;
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	47 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	48
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	49 template <typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	50 static bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	51 str_data_cmpi (const typename T::value_type a, const typename T::value_type b,
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	52 const typename T::size_type n)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	53 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	54 for (typename T::size_type i = 0; i < n; ++i)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	55 if (std::tolower (a[i]) != std::tolower (b[i]))
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	56 return false;
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	57 return true;
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	58 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	59
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	60
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	61 // Templates to handle std::basic_string, std::vector, Array, and char*.
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	62 template <typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	63 typename T::size_type
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	64 numel (const T& str)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	65 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	66 return str.size ();
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	67 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	68
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	69 template <>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	70 octave_idx_type
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	71 numel (const Array<char>& str)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	72 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	73 return str.numel ();
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	74 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	75
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	76 template <typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	77 typename T::size_type
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	78 strlen (const typename T::value_type *str)
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	79 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	80 return std::strlen (str);
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	81 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	82
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	83 template <typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	84 bool
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	85 sizes_cmp (const T& str_a, const T& str_b)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	86 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	87 return str_a.size () == str_b.size ();
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	88 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	89
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	90 template <>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	91 bool
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	92 sizes_cmp (const Array<char>& str_a, const Array<char>& str_b)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	93 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	94 return str_a.dims () == str_b.dims ();
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	95 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	96
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	97 template <typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	98 bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	99 sizes_cmp (const T& str_a, const typename T::value_type *str_b)
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	100 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	101 return str_a.size () == strlen<T> (str_b);
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	102 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	103
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	104 template <>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	105 bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	106 sizes_cmp (const Array<char>& str_a, const char *str_b)
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	107 {
23592 80e3bfb7bd5a maint: Deprecate is_vector and replace with isvector. Rik <rik@octave.org> parents: 23462 diff changeset	108 return (str_a.isvector () && str_a.rows () == 1
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	109 && str_a.numel () == strlen<Array<char>> (str_b));
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	110 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	111
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	112
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	113 template<typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	114 bool
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	115 octave::string::strcmp (const T& str_a, const T& str_b)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	116 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	117 return (sizes_cmp (str_a, str_b)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	118 && str_data_cmp<T> (str_a.data (), str_b.data (), numel (str_a)));
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	119 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	120
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	121 template<typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	122 bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	123 octave::string::strcmp (const T& str_a, const typename T::value_type *str_b)
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	124 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	125 return (sizes_cmp (str_a, str_b)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	126 && str_data_cmp<T> (str_a.data (), str_b, numel (str_a)));
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	127 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	128
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	129
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	130 template<typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	131 bool
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	132 octave::string::strcmpi (const T& str_a, const T& str_b)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	133 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	134 return (sizes_cmp (str_a, str_b)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	135 && str_data_cmpi<T> (str_a.data (), str_b.data (), numel (str_a)));
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	136 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	137
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	138 template<typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	139 bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	140 octave::string::strcmpi (const T& str_a, const typename T::value_type *str_b)
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	141 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	142 return (sizes_cmp (str_a, str_b)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	143 && str_data_cmpi<T> (str_a.data (), str_b, numel (str_a)));
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	144 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	145
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	146
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	147 template<typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	148 bool
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	149 octave::string::strncmp (const T& str_a, const T& str_b,
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	150 const typename T::size_type n)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	151 {
25698 ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	152 typename T::size_type neff;
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	153 auto len_a = numel (str_a);
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	154 auto len_b = numel (str_b);
25828 8b548f2f8086 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 25698 diff changeset	155 neff = std::min (std::max (len_a, len_b), n);
25698 ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	156
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	157 return (len_a >= neff && len_b >= neff
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	158 && str_data_cmp<T> (str_a.data (), str_b.data (), neff));
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	159 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	160
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	161 template<typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	162 bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	163 octave::string::strncmp (const T& str_a, const typename T::value_type *str_b,
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	164 const typename T::size_type n)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	165 {
25698 ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	166 typename T::size_type neff;
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	167 auto len_a = numel (str_a);
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	168 auto len_b = strlen<T> (str_b);
25828 8b548f2f8086 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 25698 diff changeset	169 neff = std::min (std::max (len_a, len_b), n);
25698 ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	170
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	171 return (len_a >= neff && len_b >= neff
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	172 && str_data_cmp<T> (str_a.data (), str_b, neff));
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	173 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	174
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	175
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	176 template<typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	177 bool
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	178 octave::string::strncmpi (const T& str_a, const T& str_b,
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	179 const typename T::size_type n)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	180 {
25698 ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	181 typename T::size_type neff;
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	182 auto len_a = numel (str_a);
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	183 auto len_b = numel (str_b);
25828 8b548f2f8086 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 25698 diff changeset	184 neff = std::min (std::max (len_a, len_b), n);
25698 ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	185
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	186 return (len_a >= neff && len_b >= neff
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	187 && str_data_cmpi<T> (str_a.data (), str_b.data (), neff));
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	188 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	189
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	190 template<typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	191 bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	192 octave::string::strncmpi (const T& str_a, const typename T::value_type *str_b,
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	193 const typename T::size_type n)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	194 {
25698 ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	195 typename T::size_type neff;
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	196 auto len_a = numel (str_a);
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	197 auto len_b = strlen<T> (str_b);
25828 8b548f2f8086 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 25698 diff changeset	198 neff = std::min (std::max (len_a, len_b), n);
25698 ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	199
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	200 return (len_a >= neff && len_b >= neff
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	201 && str_data_cmpi<T> (str_a.data (), str_b, neff));
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	202 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	203
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	204
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	205 // Instantiations we need
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	206 #define INSTANTIATE_OCTAVE_STRING(T) \
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	207 template bool octave::string::strcmp<T> (const T&, const T&); \
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	208 template bool octave::string::strcmp<T> (const T&, \
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	209 const typename T::value_type*); \
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	210 template bool octave::string::strcmpi<T> (const T&, const T&); \
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	211 template bool octave::string::strcmpi<T> (const T&, \
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	212 const typename T::value_type*); \
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	213 template bool octave::string::strncmp<T> (const T&, const T&, \
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	214 const typename T::size_type); \
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	215 template bool octave::string::strncmp<T> (const T&, \
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	216 const typename T::value_type*, \
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	217 const typename T::size_type); \
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	218 template bool octave::string::strncmpi<T> (const T&, const T&, \
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	219 const typename T::size_type n); \
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	220 template bool octave::string::strncmpi<T> (const T&, \
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	221 const typename T::value_type*, \
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	222 const typename T::size_type);
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	223
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	224 // We could also instantiate std::vector<char> but would it be
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	225 // useful for anyone?
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	226 INSTANTIATE_OCTAVE_STRING(std::string)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	227 INSTANTIATE_OCTAVE_STRING(Array<char>)
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	228
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	229 #undef INSTANTIATE_OCTAVE_STRING
26110 b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	230
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	231 static inline bool
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	232 is_imag_unit (int c)
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	233 { return c == 'i' \|\| c == 'j'; }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	234
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	235 static double
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	236 single_num (std::istringstream& is)
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	237 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	238 double num = 0.0;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	239
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	240 char c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	241
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	242 // Skip spaces.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	243 while (isspace (c))
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	244 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	245 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	246 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	247 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	248
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	249 if (std::toupper (c) == 'I')
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	250 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	251 // It's infinity.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	252 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	253 char c1 = is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	254 char c2 = is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	255 if (std::tolower (c1) == 'n' && std::tolower (c2) == 'f')
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	256 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	257 num = octave::numeric_limits<double>::Inf ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	258 is.peek (); // May set EOF bit.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	259 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	260 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	261 is.setstate (std::ios::failbit); // indicate that read has failed.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	262 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	263 else if (c == 'N')
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	264 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	265 // It's NA or NaN
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	266 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	267 char c1 = is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	268 if (c1 == 'A')
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	269 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	270 num = octave_NA;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	271 is.peek (); // May set EOF bit.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	272 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	273 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	274 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	275 char c2 = is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	276 if (c1 == 'a' && c2 == 'N')
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	277 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	278 num = octave::numeric_limits<double>::NaN ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	279 is.peek (); // May set EOF bit.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	280 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	281 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	282 is.setstate (std::ios::failbit); // indicate that read has failed.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	283 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	284 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	285 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	286 is >> num;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	287
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	288 return num;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	289 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	290
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	291 static std::istringstream&
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	292 extract_num (std::istringstream& is, double& num, bool& imag, bool& have_sign)
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	293 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	294 have_sign = imag = false;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	295
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	296 char c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	297
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	298 // Skip leading spaces.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	299 while (isspace (c))
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	300 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	301 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	302 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	303 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	304
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	305 bool negative = false;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	306
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	307 // Accept leading sign.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	308 if (c == '+' \|\| c == '-')
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	309 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	310 have_sign = true;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	311 negative = c == '-';
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	312 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	313 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	314 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	315
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	316 // Skip spaces after sign.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	317 while (isspace (c))
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	318 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	319 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	320 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	321 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	322
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	323 // Imaginary number (i*num or just i), or maybe 'inf'.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	324 if (c == 'i')
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	325 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	326 // possible infinity.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	327 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	328 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	329
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	330 if (is.eof ())
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	331 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	332 // just 'i' and string is finished. Return immediately.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	333 imag = true;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	334 num = (negative ? -1.0 : 1.0);
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	335 return is;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	336 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	337 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	338 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	339 if (std::tolower (c) != 'n')
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	340 imag = true;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	341 is.unget ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	342 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	343 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	344 else if (c == 'j')
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	345 imag = true;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	346
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	347 // It's i*num or just i
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	348 if (imag)
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	349 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	350 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	351 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	352 // Skip spaces after imaginary unit.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	353 while (isspace (c))
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	354 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	355 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	356 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	357 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	358
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	359 if (c == '*')
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	360 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	361 // Multiplier follows, we extract it as a number.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	362 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	363 num = single_num (is);
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	364 if (is.good ())
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	365 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	366 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	367 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	368 num = 1.0;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	369 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	370 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	371 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	372 // It's num, num*i, or numi.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	373 num = single_num (is);
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	374 if (is.good ())
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	375 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	376 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	377
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	378 // Skip spaces after number.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	379 while (isspace (c))
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	380 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	381 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	382 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	383 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	384
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	385 if (c == '*')
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	386 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	387 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	388 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	389
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	390 // Skip spaces after operator.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	391 while (isspace (c))
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	392 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	393 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	394 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	395 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	396
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	397 if (is_imag_unit (c))
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	398 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	399 imag = true;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	400 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	401 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	402 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	403 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	404 is.setstate (std::ios::failbit); // indicate read has failed.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	405 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	406 else if (is_imag_unit (c))
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	407 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	408 imag = true;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	409 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	410 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	411 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	412 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	413 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	414
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	415 if (is.good ())
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	416 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	417 // Skip trailing spaces.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	418 while (isspace (c))
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	419 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	420 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	421 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	422 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	423 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	424
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	425 if (negative)
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	426 num = -num;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	427
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	428 return is;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	429 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	430
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	431 static inline void
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	432 set_component (Complex& c, double num, bool imag)
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	433 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	434 #if defined (HAVE_CXX_COMPLEX_SETTERS)
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	435 if (imag)
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	436 c.imag (num);
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	437 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	438 c.real (num);
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	439 #elif defined (HAVE_CXX_COMPLEX_REFERENCE_ACCESSORS)
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	440 if (imag)
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	441 c.imag () = num;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	442 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	443 c.real () = num;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	444 #else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	445 if (imag)
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	446 c = Complex (c.real (), num);
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	447 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	448 c = Complex (num, c.imag ());
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	449 #endif
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	450 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	451
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	452 Complex
26127 37e3aa267374 Move function str2double inside octave::string namespace (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26111 diff changeset	453 octave::string::str2double (const std::string& str_arg)
26110 b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	454 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	455 Complex val (0.0, 0.0);
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	456
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	457 std::string str = str_arg;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	458
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	459 // FIXME: removing all commas doesn't allow actual parsing.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	460 // Example: "1,23.45" is wrong, but passes Octave.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	461 str.erase (std::remove (str.begin (), str.end(), ','), str.end ());
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	462 std::istringstream is (str);
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	463
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	464 double num;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	465 bool i1, i2, s1, s2;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	466
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	467 if (is.eof ())
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	468 val = octave::numeric_limits<double>::NaN ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	469 else if (! extract_num (is, num, i1, s1))
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	470 val = octave::numeric_limits<double>::NaN ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	471 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	472 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	473 set_component (val, num, i1);
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	474
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	475 if (! is.eof ())
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	476 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	477 if (! extract_num (is, num, i2, s2) \|\| i1 == i2 \|\| ! s2)
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	478 val = octave::numeric_limits<double>::NaN ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	479 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	480 set_component (val, num, i2);
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	481 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	482 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	483
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	484 return val;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	485 }
26111 3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	486
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	487 template <typename T>
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	488 std::string
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	489 rational_approx (T val, int len)
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	490 {
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	491 std::string s;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	492
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	493 if (len <= 0)
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	494 len = 10;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	495
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	496 if (octave::math::isinf (val))
26192 6c482f11f9ad Return "-1/0" for rational approximation of -Inf instead of "1/0". Rik <rik@octave.org> parents: 26127 diff changeset	497 {
6c482f11f9ad Return "-1/0" for rational approximation of -Inf instead of "1/0". Rik <rik@octave.org> parents: 26127 diff changeset	498 if (val > 0)
6c482f11f9ad Return "-1/0" for rational approximation of -Inf instead of "1/0". Rik <rik@octave.org> parents: 26127 diff changeset	499 s = "1/0";
6c482f11f9ad Return "-1/0" for rational approximation of -Inf instead of "1/0". Rik <rik@octave.org> parents: 26127 diff changeset	500 else
6c482f11f9ad Return "-1/0" for rational approximation of -Inf instead of "1/0". Rik <rik@octave.org> parents: 26127 diff changeset	501 s = "-1/0";
6c482f11f9ad Return "-1/0" for rational approximation of -Inf instead of "1/0". Rik <rik@octave.org> parents: 26127 diff changeset	502 }
26111 3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	503 else if (octave::math::isnan (val))
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	504 s = "0/0";
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	505 else if (val < std::numeric_limits<int>::min ()
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	506 \|\| val > std::numeric_limits<int>::max ()
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	507 \|\| octave::math::x_nint (val) == val)
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	508 {
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	509 std::ostringstream buf;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	510 buf.flags (std::ios::fixed);
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	511 buf << std::setprecision (0) << octave::math::round (val);
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	512 s = buf.str ();
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	513 }
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	514 else
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	515 {
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	516 T lastn = 1;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	517 T lastd = 0;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	518 T n = octave::math::round (val);
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	519 T d = 1;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	520 T frac = val - n;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	521 int m = 0;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	522
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	523 std::ostringstream buf2;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	524 buf2.flags (std::ios::fixed);
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	525 buf2 << std::setprecision (0) << static_cast<int> (n);
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	526 s = buf2.str ();
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	527
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	528 while (true)
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	529 {
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	530 T flip = 1 / frac;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	531 T step = octave::math::round (flip);
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	532 T nextn = n;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	533 T nextd = d;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	534
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	535 // Have we converged to 1/intmax ?
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	536 if (std::abs (flip) > static_cast<T> (std::numeric_limits<int>::max ()))
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	537 {
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	538 lastn = n;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	539 lastd = d;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	540 break;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	541 }
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	542
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	543 frac = flip - step;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	544 n = step * n + lastn;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	545 d = step * d + lastd;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	546 lastn = nextn;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	547 lastd = nextd;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	548
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	549 std::ostringstream buf;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	550 buf.flags (std::ios::fixed);
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	551 buf << std::setprecision (0) << static_cast<int> (n)
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	552 << '/' << static_cast<int> (d);
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	553 m++;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	554
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	555 if (n < 0 && d < 0)
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	556 {
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	557 // Double negative, string can be two characters longer.
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	558 if (buf.str ().length () > static_cast<unsigned int> (len + 2))
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	559 break;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	560 }
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	561 else if (buf.str ().length () > static_cast<unsigned int> (len))
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	562 break;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	563
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	564 if (std::abs (n) > std::numeric_limits<int>::max ()
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	565 \|\| std::abs (d) > std::numeric_limits<int>::max ())
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	566 break;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	567
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	568 s = buf.str ();
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	569 }
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	570
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	571 if (lastd < 0)
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	572 {
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	573 // Move sign to the top
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	574 lastd = - lastd;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	575 lastn = - lastn;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	576 std::ostringstream buf;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	577 buf.flags (std::ios::fixed);
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	578 buf << std::setprecision (0) << static_cast<int> (lastn)
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	579 << '/' << static_cast<int> (lastd);
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	580 s = buf.str ();
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	581 }
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	582 }
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	583
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	584 return s;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	585 }
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	586
27956 2310164737b3 fix many spelling errors (bug #57613) John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	587 // instantiate the template for float and double
26111 3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	588 template std::string rational_approx <float> (float val, int len);
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	589 template std::string rational_approx <double> (double val, int len);

Mercurial > octave

annotate liboctave/util/oct-string.cc @ 27956:2310164737b3 stable