Mercurial > hg > octave-nkf
view src/OPERATORS/op-s-cm.cc @ 14294:9e3983c8963c
deprecate the static keyword
* octave.gperf: Use PERSISTENT as the token for "static" and
"persistent" but use separate static_kw and persistent_kw values so we
can distinguish them.
* lex.ll (is_keyword_token): Handle static_kw and persistent_kw
separately. Generate deprecated keyword warning for static_kw.
* oct-parse.cc: Use PERSISTENT token instead of STATIC.
* pt-decl.h, pt-decl.cc (tree_persistent_command): Rename from
tree_static_command. Change all uses.
* pt-walk.h (tree_walker::visit_persistent_command):
Rename from visit_static_command. Change all derived classes.
* NEWS: note that static has been deprecated.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 30 Jan 2012 23:42:41 -0500 |
parents | 72c96de7a403 |
children |
line wrap: on
line source
/* Copyright (C) 1996-2012 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/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "mx-s-cm.h" #include "mx-cm-s.h" #include "mx-s-cnda.h" #include "mx-cnda-s.h" #include "gripes.h" #include "oct-obj.h" #include "ov.h" #include "ov-scalar.h" #include "ov-float.h" #include "ov-cx-mat.h" #include "ov-flt-cx-mat.h" #include "ov-re-mat.h" #include "ov-typeinfo.h" #include "ops.h" #include "xdiv.h" #include "xpow.h" // scalar by complex matrix ops. DEFNDBINOP_OP (add, scalar, complex_matrix, scalar, complex_array, +) DEFNDBINOP_OP (sub, scalar, complex_matrix, scalar, complex_array, -) DEFNDBINOP_OP (mul, scalar, complex_matrix, scalar, complex_array, *) DEFBINOP (div, scalar, complex_matrix) { CAST_BINOP_ARGS (const octave_scalar&, const octave_complex_matrix&); Matrix m1 = v1.matrix_value (); ComplexMatrix m2 = v2.complex_matrix_value (); MatrixType typ = v2.matrix_type (); ComplexMatrix ret = xdiv (m1, m2, typ); v2.matrix_type (typ); return ret; } DEFBINOP_FN (pow, scalar, complex_matrix, xpow) DEFBINOP (ldiv, scalar, complex_matrix) { CAST_BINOP_ARGS (const octave_scalar&, const octave_complex_matrix&); double d = v1.double_value (); if (d == 0.0) gripe_divide_by_zero (); return octave_value (v2.complex_array_value () / d); } DEFNDCMPLXCMPOP_FN (lt, scalar, complex_matrix, scalar, complex_array, mx_el_lt) DEFNDCMPLXCMPOP_FN (le, scalar, complex_matrix, scalar, complex_array, mx_el_le) DEFNDCMPLXCMPOP_FN (eq, scalar, complex_matrix, scalar, complex_array, mx_el_eq) DEFNDCMPLXCMPOP_FN (ge, scalar, complex_matrix, scalar, complex_array, mx_el_ge) DEFNDCMPLXCMPOP_FN (gt, scalar, complex_matrix, scalar, complex_array, mx_el_gt) DEFNDCMPLXCMPOP_FN (ne, scalar, complex_matrix, scalar, complex_array, mx_el_ne) DEFNDBINOP_OP (el_mul, scalar, complex_matrix, scalar, complex_array, *) DEFNDBINOP_FN (el_div, scalar, complex_matrix, scalar, complex_array, x_el_div) DEFNDBINOP_FN (el_pow, scalar, complex_matrix, scalar, complex_array, elem_xpow) DEFBINOP (el_ldiv, scalar, complex_matrix) { CAST_BINOP_ARGS (const octave_scalar&, const octave_complex_matrix&); double d = v1.double_value (); if (d == 0.0) gripe_divide_by_zero (); return octave_value (v2.complex_array_value () / d); } DEFNDBINOP_FN (el_and, scalar, complex_matrix, scalar, complex_array, mx_el_and) DEFNDBINOP_FN (el_or, scalar, complex_matrix, scalar, complex_array, mx_el_or) DEFNDCATOP_FN (s_cm, scalar, complex_matrix, array, complex_array, concat) DEFCONV (complex_matrix_conv, scalar, complex_matrix) { CAST_CONV_ARG (const octave_scalar&); return new octave_complex_matrix (ComplexMatrix (v.matrix_value ())); } void install_s_cm_ops (void) { INSTALL_BINOP (op_add, octave_scalar, octave_complex_matrix, add); INSTALL_BINOP (op_sub, octave_scalar, octave_complex_matrix, sub); INSTALL_BINOP (op_mul, octave_scalar, octave_complex_matrix, mul); INSTALL_BINOP (op_div, octave_scalar, octave_complex_matrix, div); INSTALL_BINOP (op_pow, octave_scalar, octave_complex_matrix, pow); INSTALL_BINOP (op_ldiv, octave_scalar, octave_complex_matrix, ldiv); INSTALL_BINOP (op_lt, octave_scalar, octave_complex_matrix, lt); INSTALL_BINOP (op_le, octave_scalar, octave_complex_matrix, le); INSTALL_BINOP (op_eq, octave_scalar, octave_complex_matrix, eq); INSTALL_BINOP (op_ge, octave_scalar, octave_complex_matrix, ge); INSTALL_BINOP (op_gt, octave_scalar, octave_complex_matrix, gt); INSTALL_BINOP (op_ne, octave_scalar, octave_complex_matrix, ne); INSTALL_BINOP (op_el_mul, octave_scalar, octave_complex_matrix, el_mul); INSTALL_BINOP (op_el_div, octave_scalar, octave_complex_matrix, el_div); INSTALL_BINOP (op_el_pow, octave_scalar, octave_complex_matrix, el_pow); INSTALL_BINOP (op_el_ldiv, octave_scalar, octave_complex_matrix, el_ldiv); INSTALL_BINOP (op_el_and, octave_scalar, octave_complex_matrix, el_and); INSTALL_BINOP (op_el_or, octave_scalar, octave_complex_matrix, el_or); INSTALL_CATOP (octave_scalar, octave_complex_matrix, s_cm); INSTALL_ASSIGNCONV (octave_scalar, octave_complex_matrix, octave_complex_matrix); INSTALL_ASSIGNCONV (octave_float_scalar, octave_complex_matrix, octave_float_complex_matrix); INSTALL_WIDENOP (octave_scalar, octave_complex_matrix, complex_matrix_conv); }