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

annotate liboctave/util/oct-string.cc @ 32021:da2954782945

gui: Use iconv/gnulib to save editor content in non-UTF-8. * bootstrap.conf: Add module "uniconv/u16-conv-to-enc". * liboctave/wrappers/uniconv-wrappers.c, liboctave/wrappers/uniconv-wrappers.h (octave_u16_conv_to_encoding, octave_u16_conv_to_encoding_strict): Add wrappers for gnulib function. * liboctave/util/oct-string.cc, liboctave/util/oct-string.h (octave::string::u16_to_encoding): Add new function. * libgui/src/m-editor/file-editor-tab.h (octave::file_editor_tab::check_valid_codec): Change return type of function. * libgui/src/m-editor/file-editor-tab.cc (octave::file_editor_tab::do_save_file): Use iconv/gnulib functions to save file editor content in non-UTF-8 encoding. The interpreter needs to be able to read these files using the iconv/gnulib functions anyway. And Qt6 can only convert to UTF-8, UTF-16, UTF-32 or the system locale encoding. (octave::file_editor_tab::check_valid_codec): Use iconv/gnulib facilities to check if selected encoding is valid for file editor content. (octave::file_editor_tab::save_file): Adjust for changed return type of check_valid_codec.

author	Markus Mützel <markus.muetzel@gmx.de>
date	Sat, 15 Apr 2023 11:29:15 +0200
parents	701fbdfb3bc0
children	36b6c5a77727

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
31706 597f3ee61a48 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 31364 diff changeset	3 // Copyright (C) 2016-2023 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
22280 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 #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	27 # include "config.h"
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	28 #endif
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	29
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	30 #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	31
26110 b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	32 #include <algorithm>
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	33 #include <cctype>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	34 #include <cstring>
26111 3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	35 #include <iomanip>
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	36 #include <string>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	37
23462 314d980bee93 maint: Add '#include "XXX.h"' to XXX.cc files. Rik <rik@octave.org> parents: 23449 diff changeset	38 #include "Array.h"
26111 3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	39 #include "lo-ieee.h"
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	40 #include "lo-mappers.h"
26702 2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	41 #include "uniconv-wrappers.h"
27785 3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	42 #include "unistr-wrappers.h"
26702 2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	43 #include "unwind-prot.h"
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	44
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	45 template <typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	46 static bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	47 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	48 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	49 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	50 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	51 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	52 return false;
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	53 return true;
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	54 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	55
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	56 template <typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	57 static bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	58 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	59 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	60 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	61 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	62 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	63 return false;
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	64 return true;
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
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 // 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	69 template <typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	70 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	71 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	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.size ();
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 <>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	77 octave_idx_type
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	78 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	79 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	80 return str.numel ();
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 typename T::size_type
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	85 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	86 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	87 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	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 <typename T>
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 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	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.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	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 <>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	98 bool
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	99 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	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.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	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 <typename T>
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 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	107 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	108 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	109 }
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 template <>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	112 bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	113 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	114 {
23592 80e3bfb7bd5a maint: Deprecate is_vector and replace with isvector. Rik <rik@octave.org> parents: 23462 diff changeset	115 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	116 && 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	117 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	118
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 template<typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	121 bool
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	122 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	123 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	124 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	125 && 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	126 }
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 template<typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	129 bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	130 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	131 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	132 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	133 && 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	134 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	135
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 template<typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	138 bool
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	139 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	140 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	141 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	142 && 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	143 }
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 template<typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	146 bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	147 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	148 {
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	149 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	150 && 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	151 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	152
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	153
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	154 template<typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	155 bool
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	156 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	157 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	158 {
25698 ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	159 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	160 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	161 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	162 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	163
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	164 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	165 && 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	166 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	167
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	168 template<typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	169 bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	170 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	171 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	172 {
25698 ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	173 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	174 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	175 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	176 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	177
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	178 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	179 && 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	180 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	181
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	182
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	183 template<typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	184 bool
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	185 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	186 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	187 {
25698 ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	188 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	189 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	190 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	191 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	192
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	193 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	194 && 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	195 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	196
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	197 template<typename T>
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	198 bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	199 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	200 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	201 {
25698 ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	202 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	203 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	204 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	205 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	206
ac386820f2b6 Return true when strncmp matches, but number of characters exceeds strlen (bug #54373) Rik <rik@octave.org> parents: 25054 diff changeset	207 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	208 && 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	209 }
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	210
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	211
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	212 // Instantiations we need
29230 6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	213 #define INSTANTIATE_OCTAVE_STRING(T, API) \
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	214 template API bool octave::string::strcmp<T> (const T&, const T&); \
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	215 template API bool \
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	216 octave::string::strcmp<T> (const T&, const typename T::value_type*); \
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	217 template API bool octave::string::strcmpi<T> (const T&, const T&); \
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	218 template API bool \
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	219 octave::string::strcmpi<T> (const T&, const typename T::value_type*); \
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	220 template API bool \
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	221 octave::string::strncmp<T> (const T&, const T&, \
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	222 const typename T::size_type); \
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	223 template API bool \
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	224 octave::string::strncmp<T> (const T&, const typename T::value_type*, \
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	225 const typename T::size_type); \
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	226 template API bool \
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	227 octave::string::strncmpi<T> (const T&, const T&, \
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	228 const typename T::size_type n); \
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	229 template API bool \
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	230 octave::string::strncmpi<T> (const T&, const typename T::value_type*, \
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	231 const typename T::size_type);
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	232
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	233 // 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	234 // useful for anyone?
29230 6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	235 INSTANTIATE_OCTAVE_STRING(std::string, OCTAVE_API)
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	236 INSTANTIATE_OCTAVE_STRING(Array<char>, OCTAVE_API)
22280 26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	237
26109cce022e New string utility functions to replace caseless_str for liboctave (bug #48726) Carnë Draug <carandraug@octave.org> parents: diff changeset	238 #undef INSTANTIATE_OCTAVE_STRING
26110 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 static inline bool
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	241 is_imag_unit (int c)
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	242 { return c == 'i' \|\| c == 'j'; }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	243
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	244 static double
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	245 single_num (std::istringstream& is)
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	246 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	247 double num = 0.0;
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 char c = is.peek ();
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 // Skip spaces.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	252 while (isspace (c))
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	253 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	254 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	255 c = is.peek ();
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
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	258 if (std::toupper (c) == 'I')
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 // It's infinity.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	261 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	262 char c1 = is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	263 char c2 = is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	264 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	265 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	266 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	267 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	268 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	269 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	270 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	271 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	272 else if (c == 'N')
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	273 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	274 // It's NA or NaN
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	275 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	276 char c1 = is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	277 if (c1 == 'A')
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	278 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	279 num = octave_NA;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	280 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	281 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	282 else
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 char c2 = is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	285 if (c1 == 'a' && c2 == 'N')
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	286 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	287 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	288 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	289 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	290 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	291 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	292 }
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 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	295 is >> num;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	296
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	297 return num;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	298 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	299
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	300 static std::istringstream&
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	301 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	302 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	303 have_sign = imag = false;
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 char c = is.peek ();
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 // Skip leading spaces.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	308 while (isspace (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 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	311 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	312 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	313
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	314 bool negative = false;
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 // Accept leading sign.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	317 if (c == '+' \|\| 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 have_sign = true;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	320 negative = c == '-';
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	321 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	322 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	323 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	324
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	325 // Skip spaces after sign.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	326 while (isspace (c))
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	327 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	328 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	329 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	330 }
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 // 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	333 if (c == 'i')
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	334 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	335 // possible infinity.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	336 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	337 c = is.peek ();
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 (is.eof ())
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	340 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	341 // 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	342 imag = true;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	343 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	344 return is;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	345 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	346 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	347 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	348 if (std::tolower (c) != 'n')
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	349 imag = true;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	350 is.unget ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	351 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	352 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	353 else if (c == 'j')
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	354 imag = true;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	355
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	356 // 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	357 if (imag)
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 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	360 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	361 // Skip spaces after imaginary unit.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	362 while (isspace (c))
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	363 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	364 is.get ();
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
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	368 if (c == '*')
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 // 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	371 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	372 num = single_num (is);
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	373 if (is.good ())
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	374 c = is.peek ();
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 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	377 num = 1.0;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	378 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	379 else
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 // 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	382 num = single_num (is);
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	383 if (is.good ())
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 c = is.peek ();
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 // Skip spaces after number.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	388 while (isspace (c))
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 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	391 c = is.peek ();
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
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	394 if (c == '*')
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 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	397 c = is.peek ();
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 // Skip spaces after operator.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	400 while (isspace (c))
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	401 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	402 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	403 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	404 }
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 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 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	413 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	414 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	415 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	416 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	417 imag = true;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	418 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	419 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	420 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	421 }
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 if (is.good ())
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	425 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	426 // Skip trailing spaces.
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	427 while (isspace (c))
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	428 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	429 is.get ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	430 c = is.peek ();
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	431 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	432 }
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 (negative)
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	435 num = -num;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	436
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	437 return is;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	438 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	439
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	440 static inline void
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	441 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	442 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	443 #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	444 if (imag)
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	445 c.imag (num);
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	446 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	447 c.real (num);
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	448 #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	449 if (imag)
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	450 c.imag () = num;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	451 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	452 c.real () = num;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	453 #else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	454 if (imag)
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	455 c = Complex (c.real (), num);
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	456 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	457 c = Complex (num, c.imag ());
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	458 #endif
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	459 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	460
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	461 Complex
26127 37e3aa267374 Move function str2double inside octave::string namespace (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26111 diff changeset	462 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	463 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	464 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	465
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	466 std::string str = str_arg;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	467
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	468 // 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	469 // 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	470 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	471 std::istringstream is (str);
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 double num;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	474 bool i1, i2, s1, s2;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	475
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	476 if (is.eof ())
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	477 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	478 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	479 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	480 else
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 set_component (val, num, i1);
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 if (! is.eof ())
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	485 {
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	486 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	487 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	488 else
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	489 set_component (val, num, i2);
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	490 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	491 }
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	492
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	493 return val;
b543cf12c63f Move octave_str2double to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 25828 diff changeset	494 }
26111 3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	495
26702 2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	496 std::string
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	497 octave::string::u8_to_encoding (const std::string& who,
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	498 const std::string& u8_string,
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	499 const std::string& encoding)
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	500 {
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	501 const uint8_t src = reinterpret_cast<const uint8_t >
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	502 (u8_string.c_str ());
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	503 std::size_t srclen = u8_string.length ();
26702 2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	504
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	505 std::size_t length;
26702 2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	506 char *native_str = octave_u8_conv_to_encoding (encoding.c_str (), src,
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	507 srclen, &length);
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	508
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	509 if (! native_str)
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	510 {
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	511 if (errno == ENOSYS)
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	512 (*current_liboctave_error_handler)
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	513 ("%s: iconv() is not supported. Installing GNU libiconv and then "
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	514 "re-compiling Octave could fix this.", who.c_str ());
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	515 else
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	516 (*current_liboctave_error_handler)
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	517 ("%s: converting from UTF-8 to codepage '%s' failed: %s",
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	518 who.c_str (), encoding.c_str (), std::strerror (errno));
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	519 }
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	520
28851 1ac5a76ae91d use [=] capture default specification where possible John W. Eaton <jwe@octave.org> parents: 28850 diff changeset	521 octave::unwind_action free_native_str ([=] () { ::free (native_str); });
26702 2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	522
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	523 std::string retval = std::string (native_str, length);
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	524
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	525 return retval;
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	526 }
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	527
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	528 std::string
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	529 octave::string::u8_from_encoding (const std::string& who,
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	530 const std::string& native_string,
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	531 const std::string& encoding)
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	532 {
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	533 const char *src = native_string.c_str ();
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	534 std::size_t srclen = native_string.length ();
26702 2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	535
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	536 std::size_t length;
26702 2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	537 uint8_t *utf8_str = octave_u8_conv_from_encoding (encoding.c_str (), src,
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	538 srclen, &length);
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	539 if (! utf8_str)
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	540 {
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	541 if (errno == ENOSYS)
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	542 (*current_liboctave_error_handler)
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	543 ("%s: iconv() is not supported. Installing GNU libiconv and then "
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	544 "re-compiling Octave could fix this.", who.c_str ());
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	545 else
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	546 (*current_liboctave_error_handler)
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	547 ("%s: converting from codepage '%s' to UTF-8 failed: %s",
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	548 who.c_str (), encoding.c_str (), std::strerror (errno));
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	549 }
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	550
28851 1ac5a76ae91d use [=] capture default specification where possible John W. Eaton <jwe@octave.org> parents: 28850 diff changeset	551 octave::unwind_action free_utf8_str ([=] () { ::free (utf8_str); });
26702 2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	552
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	553 std::string retval = std::string (reinterpret_cast<char *> (utf8_str), length);
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	554
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	555 return retval;
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	556 }
2dc190401eeb Add C++ functions to convert encoding of strings (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	557
27785 3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	558 unsigned int
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	559 octave::string::u8_validate (const std::string& who,
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	560 std::string& in_str,
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	561 const octave::string::u8_fallback_type type)
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	562 {
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	563 std::string out_str;
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	564
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	565 unsigned int num_replacements = 0;
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	566 const char *in_chr = in_str.c_str ();
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	567 const char *inv_utf8 = in_chr;
30394 f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 29655 diff changeset	568 const char *const in_end = in_chr + in_str.length ();
27785 3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	569 while (inv_utf8 && in_chr < in_end)
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	570 {
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	571 inv_utf8 = reinterpret_cast<const char *>
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	572 (octave_u8_check_wrapper (reinterpret_cast<const uint8_t *> (in_chr),
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	573 in_end - in_chr));
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	574
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	575 if (inv_utf8 == nullptr)
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	576 out_str.append (in_chr, in_end - in_chr);
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	577 else
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	578 {
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	579 num_replacements++;
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	580 out_str.append (in_chr, inv_utf8 - in_chr);
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	581 in_chr = inv_utf8 + 1;
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	582
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	583 if (type == U8_REPLACEMENT_CHAR)
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	584 out_str.append ("\xef\xbf\xbd");
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	585 else if (type == U8_ISO_8859_1)
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	586 {
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	587 std::string fallback = "iso-8859-1";
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	588 std::size_t lengthp;
27785 3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	589 uint8_t *val_utf8 = octave_u8_conv_from_encoding
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	590 (fallback.c_str (), inv_utf8, 1, &lengthp);
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	591
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	592 if (! val_utf8)
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	593 (*current_liboctave_error_handler)
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	594 ("%s: converting from codepage '%s' to UTF-8 failed: %s",
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	595 who.c_str (), fallback.c_str (), std::strerror (errno));
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	596
28824 a98fd0657e35 Replace unwind_protect with more efficient constructs in liboctave (bug #59192). Rik <rik@octave.org> parents: 27957 diff changeset	597 octave::unwind_action free_val_utf8
28851 1ac5a76ae91d use [=] capture default specification where possible John W. Eaton <jwe@octave.org> parents: 28850 diff changeset	598 ([=] () { ::free (val_utf8); });
27785 3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	599
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	600 out_str.append (reinterpret_cast<const char *> (val_utf8),
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	601 lengthp);
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	602 }
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	603 }
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	604 }
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	605
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	606 in_str = out_str;
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	607 return num_replacements;
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	608 }
3f5026fd8da8 Create valid UTF-8 from .m file content (bug #57341). Markus Mützel <markus.muetzel@gmx.de> parents: 27473 diff changeset	609
32021 da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	610 std::string
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	611 octave::string::u16_to_encoding (const std::string& who,
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	612 const std::u16string& u16_string,
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	613 const std::string& encoding)
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	614 {
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	615 const uint16_t src = reinterpret_cast<const uint16_t >
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	616 (u16_string.c_str ());
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	617 std::size_t srclen = u16_string.length ();
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	618
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	619 std::size_t length;
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	620 char *native_str = octave_u16_conv_to_encoding (encoding.c_str (), src,
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	621 srclen, &length);
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	622
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	623 if (! native_str)
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	624 {
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	625 if (errno == ENOSYS)
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	626 (*current_liboctave_error_handler)
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	627 ("%s: iconv() is not supported. Installing GNU libiconv and then "
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	628 "re-compiling Octave could fix this.", who.c_str ());
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	629 else
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	630 (*current_liboctave_error_handler)
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	631 ("%s: converting from UTF-16 to codepage '%s' failed: %s",
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	632 who.c_str (), encoding.c_str (), std::strerror (errno));
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	633 }
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	634
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	635 octave::unwind_action free_native_str ([=] () { ::free (native_str); });
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	636
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	637 std::string retval = std::string (native_str, length);
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	638
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	639 return retval;
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	640 }
da2954782945 gui: Use iconv/gnulib to save editor content in non-UTF-8. Markus Mützel <markus.muetzel@gmx.de> parents: 31970 diff changeset	641
30822 0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	642 typedef octave::string::codecvt_u8::InternT InternT;
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	643 typedef octave::string::codecvt_u8::ExternT ExternT;
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	644 typedef octave::string::codecvt_u8::StateT StateT;
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	645
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	646 typename std::codecvt<InternT, ExternT, StateT>::result
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	647 octave::string::codecvt_u8::do_out
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	648 (StateT& /* state */,
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	649 const InternT* from, const InternT* from_end, const InternT*& from_next,
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	650 ExternT* to, ExternT* to_end, ExternT*& to_next) const
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	651 {
31970 701fbdfb3bc0 codecvt_u8: Avoid random segmentation faults with libc++ (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31968 diff changeset	652 to_next = to;
31968 63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	653 if (from_end <= from)
31970 701fbdfb3bc0 codecvt_u8: Avoid random segmentation faults with libc++ (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31968 diff changeset	654 {
701fbdfb3bc0 codecvt_u8: Avoid random segmentation faults with libc++ (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31968 diff changeset	655 from_next = from_end;
701fbdfb3bc0 codecvt_u8: Avoid random segmentation faults with libc++ (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31968 diff changeset	656 return std::codecvt<InternT, ExternT, StateT>::noconv;
701fbdfb3bc0 codecvt_u8: Avoid random segmentation faults with libc++ (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31968 diff changeset	657 }
30822 0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	658
31968 63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	659 // Check if buffer ends in a complete UTF-8 surrogate.
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	660 // FIXME: If this is the last call before a stream is closed, we should
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	661 // convert trailing bytes even if they look incomplete.
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	662 // How can we detect that?
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	663 std::size_t pop_end = 0;
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	664 if ((*(from_end-1) & 0b10000000) == 0b10000000)
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	665 {
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	666 // The last byte is part of a surrogate. Check if it is complete.
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	667
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	668 // number of bytes of the surrogate in the buffer
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	669 std::size_t num_bytes_in_buf = 1;
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	670 // Find initial byte of surrogate
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	671 while (((*(from_end-num_bytes_in_buf) & 0b11000000) != 0b11000000)
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	672 && (num_bytes_in_buf < 4)
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	673 && (from_end-num_bytes_in_buf > from))
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	674 num_bytes_in_buf++;
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	675
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	676 // If the start of the surrogate is not in the buffer, we need to
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	677 // continue with the invalid UTF-8 sequence to avoid an infinite loop.
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	678 // Check if we found an initial byte and if there are enough bytes in the
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	679 // buffer to complete the surrogate.
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	680 if ((((*(from_end-num_bytes_in_buf) & 0b11100000) == 0b11000000)
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	681 && (num_bytes_in_buf < 2)) // incomplete 2-byte surrogate
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	682 \|\| (((*(from_end-num_bytes_in_buf) & 0b11110000) == 0b11100000)
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	683 && (num_bytes_in_buf < 3)) // incomplete 3-byte surrogate
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	684 \|\| (((*(from_end-num_bytes_in_buf) & 0b11111000) == 0b11110000)
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	685 && (num_bytes_in_buf < 4))) // incomplete 4-byte surrogate
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	686 pop_end = num_bytes_in_buf;
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	687 }
31970 701fbdfb3bc0 codecvt_u8: Avoid random segmentation faults with libc++ (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31968 diff changeset	688 from_next = from_end - pop_end;
31968 63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	689
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	690 std::size_t srclen = (from_end-from-pop_end) * sizeof (InternT);
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	691 std::size_t length = (to_end-to) * sizeof (ExternT);
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	692 if (srclen < 1 \|\| length < 1)
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	693 return std::codecvt<InternT, ExternT, StateT>::partial;
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	694
30822 0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	695 // Convert from UTF-8 to output encoding
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	696 const uint8_t u8_str = reinterpret_cast<const uint8_t > (from);
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	697 char *enc_str = octave_u8_conv_to_encoding (m_enc.c_str (), u8_str, srclen,
31968 63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	698 &length);
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	699
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	700 if (length < 1)
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	701 return std::codecvt<InternT, ExternT, StateT>::partial;
30822 0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	702
31968 63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	703 size_t max = (to_end - to) * sizeof (ExternT);
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	704 // FIXME: If the output encoding is a multibyte or variable byte encoding,
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	705 // we should ensure that we don't cut off a "partial" surrogate from
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	706 // the output.
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	707 // Can this ever happen?
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	708 if (length < max)
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	709 max = length;
30822 0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	710
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	711 // copy conversion result to output
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	712 std::copy_n (enc_str, max, to);
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	713 ::free (enc_str);
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	714
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	715 from_next = from + srclen;
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	716 to_next = to + max;
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	717
31968 63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	718 return ((pop_end > 0 \|\| max < length)
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	719 ? std::codecvt<InternT, ExternT, StateT>::partial
63038dcbd648 Try to gather complete UTF-8 surrogates when converting encoding (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31706 diff changeset	720 : std::codecvt<InternT, ExternT, StateT>::ok);
30822 0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	721 }
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	722
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	723 typename std::codecvt<InternT, ExternT, StateT>::result
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	724 octave::string::codecvt_u8::do_in
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	725 (StateT& /* state */,
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	726 const ExternT* from, const ExternT* from_end, const ExternT*& from_next,
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	727 InternT* to, InternT* to_end, InternT*& to_next) const
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	728 {
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	729 // Convert from input encoding to UTF-8
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	730 std::size_t srclen = (from_end-from) * sizeof (ExternT);
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	731 std::size_t lengthp = (to_end-to) * sizeof (InternT);
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	732 const char enc_str = reinterpret_cast<const char > (from);
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	733 uint8_t *u8_str = octave_u8_conv_from_encoding (m_enc.c_str (),
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	734 enc_str, srclen, &lengthp);
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	735
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	736 std::size_t max = to_end - to;
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	737 if (lengthp < max)
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	738 max = lengthp;
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	739
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	740 // copy conversion result to output
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	741 std::copy_n (u8_str, max, to);
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	742 ::free (u8_str);
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	743
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	744 from_next = from + srclen;
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	745 to_next = to + max;
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	746
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	747 return std::codecvt<InternT, ExternT, StateT>::ok;
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	748 }
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	749
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	750 int octave::string::codecvt_u8::do_length
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	751 (StateT& /* state /, const ExternT src, const ExternT *end,
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	752 std::size_t max) const
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	753 {
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	754 // return number of external characters that produce MAX internal ones
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	755 std::size_t srclen = end-src;
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	756 std::size_t offsets[srclen];
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	757 std::size_t lengthp = max;
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	758 octave_u8_conv_from_encoding_offsets (m_enc.c_str (), src, srclen, offsets,
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	759 &lengthp);
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	760 std::size_t ext_char;
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	761 for (ext_char = 0; ext_char < srclen; ext_char++)
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	762 {
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	763 if (offsets[ext_char] != static_cast<size_t> (-1)
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	764 && offsets[ext_char] >= max)
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	765 break;
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	766 }
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	767
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	768 return ext_char;
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	769 }
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	770
0826c503f294 Encoding facet based on gnulib uniconv for STL iostreams (bug #61839). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	771
26111 3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	772 template <typename T>
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	773 std::string
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	774 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	775 {
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	776 std::string s;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	777
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	778 if (len <= 0)
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	779 len = 10;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	780
30867 014030798d5e Avoid issues when converting large integers to floating point (bug #62212). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	781 static const T out_of_range_top
014030798d5e Avoid issues when converting large integers to floating point (bug #62212). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	782 = static_cast<T>(std::numeric_limits<int>::max ()) + 1.;
014030798d5e Avoid issues when converting large integers to floating point (bug #62212). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	783 static const T out_of_range_bottom
014030798d5e Avoid issues when converting large integers to floating point (bug #62212). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	784 = static_cast<T>(std::numeric_limits<int>::min ()) - 1.;
26111 3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	785 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	786 {
6c482f11f9ad Return "-1/0" for rational approximation of -Inf instead of "1/0". Rik <rik@octave.org> parents: 26127 diff changeset	787 if (val > 0)
6c482f11f9ad Return "-1/0" for rational approximation of -Inf instead of "1/0". Rik <rik@octave.org> parents: 26127 diff changeset	788 s = "1/0";
6c482f11f9ad Return "-1/0" for rational approximation of -Inf instead of "1/0". Rik <rik@octave.org> parents: 26127 diff changeset	789 else
6c482f11f9ad Return "-1/0" for rational approximation of -Inf instead of "1/0". Rik <rik@octave.org> parents: 26127 diff changeset	790 s = "-1/0";
6c482f11f9ad Return "-1/0" for rational approximation of -Inf instead of "1/0". Rik <rik@octave.org> parents: 26127 diff changeset	791 }
26111 3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	792 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	793 s = "0/0";
30867 014030798d5e Avoid issues when converting large integers to floating point (bug #62212). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	794 else if (val <= out_of_range_bottom \|\| val >= out_of_range_top
26111 3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	795 \|\| 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	796 {
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	797 std::ostringstream buf;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	798 buf.flags (std::ios::fixed);
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	799 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	800 s = buf.str ();
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	801 }
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	802 else
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	803 {
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	804 T lastn = 1;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	805 T lastd = 0;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	806 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	807 T d = 1;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	808 T frac = val - n;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	809
27473 d503426130bf Display '' rather than '0' for small rational approximations (bug #56941) Rik <rik@octave.org>* parents: 26702 diff changeset	810 std::ostringstream init_buf;
d503426130bf Display '' rather than '0' for small rational approximations (bug #56941) Rik <rik@octave.org>* parents: 26702 diff changeset	811 init_buf.flags (std::ios::fixed);
d503426130bf Display '' rather than '0' for small rational approximations (bug #56941) Rik <rik@octave.org>* parents: 26702 diff changeset	812 init_buf << std::setprecision (0) << static_cast<int> (n);
d503426130bf Display '' rather than '0' for small rational approximations (bug #56941) Rik <rik@octave.org>* parents: 26702 diff changeset	813 s = init_buf.str ();
26111 3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	814
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	815 while (true)
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	816 {
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	817 T flip = 1 / frac;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	818 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	819 T nextn = n;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	820 T nextd = d;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	821
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	822 // Have we converged to 1/intmax ?
30867 014030798d5e Avoid issues when converting large integers to floating point (bug #62212). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	823 if (std::abs (flip) > out_of_range_top)
26111 3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	824 {
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	825 lastn = n;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	826 lastd = d;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	827 break;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	828 }
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	829
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	830 frac = flip - step;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	831 n = step * n + lastn;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	832 d = step * d + lastd;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	833 lastn = nextn;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	834 lastd = nextd;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	835
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	836 std::ostringstream buf;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	837 buf.flags (std::ios::fixed);
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	838 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	839 << '/' << static_cast<int> (d);
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	840
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	841 if (n < 0 && d < 0)
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	842 {
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	843 // 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	844 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	845 break;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	846 }
27473 d503426130bf Display '' rather than '0' for small rational approximations (bug #56941) Rik <rik@octave.org>* parents: 26702 diff changeset	847 else
d503426130bf Display '' rather than '0' for small rational approximations (bug #56941) Rik <rik@octave.org>* parents: 26702 diff changeset	848 {
d503426130bf Display '' rather than '0' for small rational approximations (bug #56941) Rik <rik@octave.org>* parents: 26702 diff changeset	849 if (buf.str ().length () > static_cast<unsigned int> (len))
d503426130bf Display '' rather than '0' for small rational approximations (bug #56941) Rik <rik@octave.org>* parents: 26702 diff changeset	850 break;
d503426130bf Display '' rather than '0' for small rational approximations (bug #56941) Rik <rik@octave.org>* parents: 26702 diff changeset	851 }
26111 3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	852
30867 014030798d5e Avoid issues when converting large integers to floating point (bug #62212). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	853 if (std::abs (n) >= out_of_range_top
014030798d5e Avoid issues when converting large integers to floating point (bug #62212). Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	854 \|\| std::abs (d) >= out_of_range_top)
26111 3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	855 break;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	856
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	857 s = buf.str ();
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	858 }
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	859
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	860 if (lastd < 0)
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	861 {
27473 d503426130bf Display '' rather than '0' for small rational approximations (bug #56941) Rik <rik@octave.org>* parents: 26702 diff changeset	862 // Move negative sign from denominator to numerator
26111 3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	863 lastd = - lastd;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	864 lastn = - lastn;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	865 std::ostringstream buf;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	866 buf.flags (std::ios::fixed);
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	867 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	868 << '/' << static_cast<int> (lastd);
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	869 s = buf.str ();
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	870 }
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	871 }
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	872
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	873 return s;
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	874 }
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26110 diff changeset	875
27956 2310164737b3 fix many spelling errors (bug #57613) John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	876 // instantiate the template for float and double
29230 6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	877 template OCTAVE_API std::string rational_approx <float> (float val, int len);
6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28851 diff changeset	878 template OCTAVE_API std::string rational_approx <double> (double val, int len);

Mercurial > octave

annotate liboctave/util/oct-string.cc @ 32021:da2954782945