Mercurial > octave
view libinterp/operators/op-s-s.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 | cd2e24983670 |
children | bac0d6f07a3e |
line wrap: on
line source
/* Copyright (C) 1996-2015 John W. Eaton 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 "Array-util.h" #include "errwarn.h" #include "ovl.h" #include "ov.h" #include "ov-scalar.h" #include "ov-float.h" #include "ov-re-mat.h" #include "ov-flt-re-mat.h" #include "ov-typeinfo.h" #include "ov-null-mat.h" #include "ops.h" #include "xdiv.h" #include "xpow.h" // scalar unary ops. DEFUNOP (not, scalar) { const octave_scalar& v = dynamic_cast<const octave_scalar&> (a); double x = v.scalar_value (); if (octave::math::isnan (x)) err_nan_to_logical_conversion (); return octave_value (x == 0.0); } DEFUNOP_OP (uplus, scalar, /* no-op */) DEFUNOP_OP (uminus, scalar, -) DEFUNOP_OP (transpose, scalar, /* no-op */) DEFUNOP_OP (hermitian, scalar, /* no-op */) DEFNCUNOP_METHOD (incr, scalar, increment) DEFNCUNOP_METHOD (decr, scalar, decrement) // scalar by scalar ops. DEFBINOP_OP (add, scalar, scalar, +) DEFBINOP_OP (sub, scalar, scalar, -) DEFBINOP_OP (mul, scalar, scalar, *) DEFBINOP (div, scalar, scalar) { const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1); const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); double d = v2.double_value (); if (d == 0.0) warn_divide_by_zero (); return octave_value (v1.double_value () / d); } DEFBINOP_FN (pow, scalar, scalar, xpow) DEFBINOP (ldiv, scalar, scalar) { const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1); const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); double d = v1.double_value (); if (d == 0.0) warn_divide_by_zero (); return octave_value (v2.double_value () / d); } DEFBINOP_OP (lt, scalar, scalar, <) DEFBINOP_OP (le, scalar, scalar, <=) DEFBINOP_OP (eq, scalar, scalar, ==) DEFBINOP_OP (ge, scalar, scalar, >=) DEFBINOP_OP (gt, scalar, scalar, >) DEFBINOP_OP (ne, scalar, scalar, !=) DEFBINOP_OP (el_mul, scalar, scalar, *) DEFBINOP (el_div, scalar, scalar) { const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1); const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); double d = v2.double_value (); if (d == 0.0) warn_divide_by_zero (); return octave_value (v1.double_value () / d); } DEFBINOP_FN (el_pow, scalar, scalar, xpow) DEFBINOP (el_ldiv, scalar, scalar) { const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1); const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); double d = v1.double_value (); if (d == 0.0) warn_divide_by_zero (); return octave_value (v2.double_value () / d); } DEFSCALARBOOLOP_OP (el_and, scalar, scalar, &&) DEFSCALARBOOLOP_OP (el_or, scalar, scalar, ||) DEFNDCATOP_FN (s_s, scalar, scalar, array, array, concat) void install_s_s_ops (void) { INSTALL_UNOP (op_not, octave_scalar, not); INSTALL_UNOP (op_uplus, octave_scalar, uplus); INSTALL_UNOP (op_uminus, octave_scalar, uminus); INSTALL_UNOP (op_transpose, octave_scalar, transpose); INSTALL_UNOP (op_hermitian, octave_scalar, hermitian); INSTALL_NCUNOP (op_incr, octave_scalar, incr); INSTALL_NCUNOP (op_decr, octave_scalar, decr); INSTALL_BINOP (op_add, octave_scalar, octave_scalar, add); INSTALL_BINOP (op_sub, octave_scalar, octave_scalar, sub); INSTALL_BINOP (op_mul, octave_scalar, octave_scalar, mul); INSTALL_BINOP (op_div, octave_scalar, octave_scalar, div); INSTALL_BINOP (op_pow, octave_scalar, octave_scalar, pow); INSTALL_BINOP (op_ldiv, octave_scalar, octave_scalar, ldiv); INSTALL_BINOP (op_lt, octave_scalar, octave_scalar, lt); INSTALL_BINOP (op_le, octave_scalar, octave_scalar, le); INSTALL_BINOP (op_eq, octave_scalar, octave_scalar, eq); INSTALL_BINOP (op_ge, octave_scalar, octave_scalar, ge); INSTALL_BINOP (op_gt, octave_scalar, octave_scalar, gt); INSTALL_BINOP (op_ne, octave_scalar, octave_scalar, ne); INSTALL_BINOP (op_el_mul, octave_scalar, octave_scalar, el_mul); INSTALL_BINOP (op_el_div, octave_scalar, octave_scalar, el_div); INSTALL_BINOP (op_el_pow, octave_scalar, octave_scalar, el_pow); INSTALL_BINOP (op_el_ldiv, octave_scalar, octave_scalar, el_ldiv); INSTALL_BINOP (op_el_and, octave_scalar, octave_scalar, el_and); INSTALL_BINOP (op_el_or, octave_scalar, octave_scalar, el_or); INSTALL_CATOP (octave_scalar, octave_scalar, s_s); INSTALL_ASSIGNCONV (octave_scalar, octave_scalar, octave_matrix); INSTALL_ASSIGNCONV (octave_float_scalar, octave_scalar, octave_float_matrix); INSTALL_ASSIGNCONV (octave_scalar, octave_null_matrix, octave_matrix); INSTALL_ASSIGNCONV (octave_scalar, octave_null_str, octave_matrix); INSTALL_ASSIGNCONV (octave_scalar, octave_null_sq_str, octave_matrix); }