Mercurial > octave
view libinterp/octave-value/ov-ch-mat.cc @ 24620:f5ad5d6f16fd
Deprecate toascii function
* scripts/deprecated/toascii.m: New m-file to emit warning and
compute toascii which was previously a C++ function.
* scripts/deprecated/module.mk: Add toascii.m to build system.
* NEWS: Anounce deprecation and replacement functionality in double().
* strings.txi: Remove DOCSTRING entry. Change instances of "toascii"
to "double" in manual.
* Cell.h (xtoascii): Delete.
* mappers.cc (Ftoascii): Delete function. Replace all uses of toascii
with double in other string function BIST tests.
* ov-base-sparse.cc (map): Delete case for umap_xtoascii.
* ov-base.cc (get_umap_name): Remove "toascii" from list of umap names.
* ov-base.h (enum unary_mapper_t): Remove umap_xtoascii from enum.
* ov-cell.cc (map): Remove FORWARD_MAPPER (xtoascii).
* ov-ch-mat.cc (xtoascii): Delete function.
* ov-float.cc (map), ov-flt-re-mat.cc (map), ov-re-mat.cc (map),
ov-scalar.cc (map): Delete case for umap_xtoascii.
* ov.h: Remove MAPPER_FORWARD (xtoascii)
author | Rik <rik@octave.org> |
---|---|
date | Fri, 19 Jan 2018 10:17:36 -0800 |
parents | 194eb4bd202b |
children | 6652d3823428 |
line wrap: on
line source
/* Copyright (C) 1996-2017 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave. Octave is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <https://www.gnu.org/licenses/>. */ #if defined (HAVE_CONFIG_H) # include "config.h" #endif #include <cctype> #include <iostream> #include "dNDArray.h" #include "fNDArray.h" #include "int8NDArray.h" #include "int16NDArray.h" #include "int32NDArray.h" #include "int64NDArray.h" #include "uint8NDArray.h" #include "uint16NDArray.h" #include "uint32NDArray.h" #include "uint64NDArray.h" #include "lo-ieee.h" #include "mx-base.h" #include "mxarray.h" #include "ov-base.h" #include "ov-base-mat.h" #include "ov-base-mat.cc" #include "ov-ch-mat.h" #include "errwarn.h" #include "pr-output.h" template class octave_base_matrix<charNDArray>; idx_vector octave_char_matrix::index_vector (bool /* require_integers */) const { const char *p = matrix.data (); if (numel () == 1 && *p == ':') return idx_vector (':'); else return idx_vector (array_value (true)); } double octave_char_matrix::double_value (bool) const { if (rows () == 0 || columns () == 0) err_invalid_conversion ("character matrix", "real scalar"); warn_implicit_conversion ("Octave:array-to-scalar", "character matrix", "real scalar"); return static_cast<unsigned char> (matrix(0, 0)); } float octave_char_matrix::float_value (bool) const { if (rows () == 0 && columns () == 0) err_invalid_conversion ("character matrix", "real scalar"); warn_implicit_conversion ("Octave:array-to-scalar", "character matrix", "real scalar"); return static_cast<unsigned char> (matrix(0, 0)); } octave_int64 octave_char_matrix::int64_scalar_value () const { octave_int64 retval = 0; if (rows () == 0 || columns () == 0) err_invalid_conversion ("character matrix", "int64 scalar"); warn_implicit_conversion ("Octave:array-to-scalar", "character matrix", "int64 scalar"); retval = octave_int64 (matrix(0, 0)); return retval; } octave_uint64 octave_char_matrix::uint64_scalar_value () const { octave_uint64 retval = 0; if (rows () == 0 || columns () == 0) err_invalid_conversion ("character matrix", "uint64 scalar"); warn_implicit_conversion ("Octave:array-to-scalar", "character matrix", "uint64 scalar"); retval = octave_uint64 (matrix(0, 0)); return retval; } Complex octave_char_matrix::complex_value (bool) const { if (rows () == 0 && columns () == 0) err_invalid_conversion ("character matrix", "complex scalar"); warn_implicit_conversion ("Octave:array-to-scalar", "character matrix", "complex scalar"); return Complex (static_cast<unsigned char> (matrix(0, 0)), 0); } FloatComplex octave_char_matrix::float_complex_value (bool) const { float tmp = lo_ieee_float_nan_value (); FloatComplex retval (tmp, tmp); if (rows () == 0 || columns () == 0) err_invalid_conversion ("character matrix", "complex scalar"); warn_implicit_conversion ("Octave:array-to-scalar", "character matrix", "complex scalar"); retval = static_cast<unsigned char> (matrix(0, 0)); return retval; } octave_value octave_char_matrix::as_double (void) const { return NDArray (matrix); } octave_value octave_char_matrix::as_single (void) const { return FloatNDArray (matrix); } octave_value octave_char_matrix::as_int8 (void) const { return int8NDArray (matrix); } octave_value octave_char_matrix::as_int16 (void) const { return int16NDArray (matrix); } octave_value octave_char_matrix::as_int32 (void) const { return int32NDArray (matrix); } octave_value octave_char_matrix::as_int64 (void) const { return int64NDArray (matrix); } octave_value octave_char_matrix::as_uint8 (void) const { return uint8NDArray (matrix); } octave_value octave_char_matrix::as_uint16 (void) const { return uint16NDArray (matrix); } octave_value octave_char_matrix::as_uint32 (void) const { return uint32NDArray (matrix); } octave_value octave_char_matrix::as_uint64 (void) const { return uint64NDArray (matrix); } void octave_char_matrix::print_raw (std::ostream& os, bool pr_as_read_syntax) const { octave_print_internal (os, matrix, pr_as_read_syntax, current_print_indent_level ()); } mxArray * octave_char_matrix::as_mxArray (void) const { mxArray *retval = new mxArray (mxCHAR_CLASS, dims (), mxREAL); mxChar *pr = static_cast<mxChar *> (retval->get_data ()); mwSize nel = numel (); const char *p = matrix.data (); for (mwIndex i = 0; i < nel; i++) pr[i] = p[i]; return retval; } // The C++ standard guarantees cctype defines functions, not macros (and // hence macros *CAN'T* be defined if only cctype is included) so // there's no need to fuck around. The exceptions are isascii and // toascii, which are not C++. Oddly enough, all those character // functions are int (*) (int), even in C++. Wicked! static inline int xisascii (int c) { #if defined (HAVE_ISASCII) return isascii (c); #else return (c >= 0x00 && c <= 0x7f); #endif } octave_value octave_char_matrix::map (unary_mapper_t umap) const { octave_value retval; switch (umap) { #define STRING_MAPPER(UMAP,FCN,TYPE) \ case umap_ ## UMAP: \ return octave_value (matrix.map<TYPE, int (&) (int)> (FCN)) STRING_MAPPER (xisalnum, std::isalnum, bool); STRING_MAPPER (xisalpha, std::isalpha, bool); STRING_MAPPER (xisascii, xisascii, bool); STRING_MAPPER (xiscntrl, std::iscntrl, bool); STRING_MAPPER (xisdigit, std::isdigit, bool); STRING_MAPPER (xisgraph, std::isgraph, bool); STRING_MAPPER (xislower, std::islower, bool); STRING_MAPPER (xisprint, std::isprint, bool); STRING_MAPPER (xispunct, std::ispunct, bool); STRING_MAPPER (xisspace, std::isspace, bool); STRING_MAPPER (xisupper, std::isupper, bool); STRING_MAPPER (xisxdigit, std::isxdigit, bool); STRING_MAPPER (xtolower, std::tolower, char); STRING_MAPPER (xtoupper, std::toupper, char); // For Matlab compatibility, these should work on ASCII values // without error or warning. case umap_abs: case umap_ceil: case umap_fix: case umap_floor: case umap_imag: case umap_isinf: case umap_isnan: case umap_real: case umap_round: { octave_matrix m (array_value (true)); return m.map (umap); } default: error ("%s: argument must be numeric", get_umap_name (umap)); break; } return retval; }