Mercurial > octave
view libinterp/octave-value/ov-ch-mat.cc @ 22296:8b18f46f6427
revamp double, single, int type conversions
* ov-type-conv.h: Delete.
* libinterp/octave-value/module.mk: Update.
* op-double-conv.cc, op-float-conv.cc, op-int-conv.cc: Delete.
* libinterp/operators/module.mk: Update.
* ov.h, ov.cc, ov-base.h, ov-base.cc (octave_value::as_double,
octave_value::as_single, octave_value:as_int8, octave_value:as_int16,
octave_value:as_int32, octave_value:as_int64, octave_value:as_uint8,
octave_value:as_uint16, octave_value:as_uint32,
octave_value:as_uint64): New functions.
* ov.cc (Fdouble, Fsingle, Fint8, Fint16, Fint32, Fint64, Fuint8,
Fuint16, Fuint32, Fuint64): Move here. Simply call as_double,
as_single, etc. member functions.
* ov-base-int.cc, ov-base-int.h, ov-base-scalar.cc, ov-bool-mat.cc,
ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc,
ov-bool.h, ov-ch-mat.cc, ov-ch-mat.h, ov-complex.cc, ov-complex.h,
ov-cx-diag.cc, ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h,
ov-cx-sparse.cc, ov-cx-sparse.h, ov-float.cc, ov-float.h,
ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-diag.cc,
ov-flt-cx-diag.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h,
ov-flt-re-diag.cc, ov-flt-re-diag.h, ov-flt-re-mat.cc,
ov-flt-re-mat.h, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc,
ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h, ov-re-diag.cc,
ov-re-diag.h, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc,
ov-re-sparse.h, ov-scalar.cc, ov-scalar.h, ov-uint16.cc, ov-uint32.cc,
ov-uint64.cc, ov-uint8.cc:
Define as_double, as_single, etc. member functions as appropriate.
* ov-typeinfo.h, ov-typeinfo.cc
(octave_value_typeinfo::type_conv_ops): Delete data member. Remove
all uses.
(octave_value_typeinfo::register_type_conv_op): Delete.
(octave_value_typeinfo::do_register_type_conv_op): Delete.
(octave_value_typeinfo::do_lookup_type_conv_op): Delete.
* ops.h (INSTALL_CONVOP, CONVDECLX, DEFCONVFNX, DEFCONVFNX2, DEFDBLCONVFN,
DEFFLTCONVFN, DEFSTRINTCONVFN, DEFSTRDBLCONVFN, DEFSTRFLTCONVFN,
DEFCONVFN, DEFCONVFN2): Delete obsolete macros.
* op-bm-bm.cc, op-cdm-cdm.cc, op-cm-cm.cc, op-cs-cs.cc, op-dm-dm.cc,
op-fcdm-fcdm.cc, op-fcm-fcm.cc, op-fcs-fcs.cc, op-fdm-fdm.cc,
op-fm-fm.cc, op-fs-fs.cc, op-m-m.cc, op-pm-pm.cc, op-s-s.cc,
op-sbm-sbm.cc: Delete unused type conversion functions.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 15 Aug 2016 02:01:29 -0400 |
parents | e43d83253e28 |
children | bac0d6f07a3e |
line wrap: on
line source
/* Copyright (C) 1996-2015 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 <http://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 { double retval = lo_ieee_nan_value (); if (rows () == 0 || columns () == 0) err_invalid_conversion ("character matrix", "real scalar"); warn_implicit_conversion ("Octave:array-to-scalar", "character matrix", "real scalar"); retval = static_cast<unsigned char> (matrix(0, 0)); return retval; } float octave_char_matrix::float_value (bool) const { float retval = lo_ieee_float_nan_value (); if (rows () == 0 && columns () == 0) err_invalid_conversion ("character matrix", "real scalar"); warn_implicit_conversion ("Octave:array-to-scalar", "character matrix", "real scalar"); retval = static_cast<unsigned char> (matrix(0, 0)); return retval; } 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 { double tmp = lo_ieee_nan_value (); Complex 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; } 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 } static inline int xtoascii (int c) { #if defined (HAVE_TOASCII) return toascii (c); #else return (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 (xtoascii, xtoascii, double); 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; }