octave: libinterp/operators/op-b-bm.cc annotate

annotate libinterp/operators/op-b-bm.cc @ 21647:66cae7a6dc47

eliminate some macros for operator definitions * ops.h (CAST_UNOP_ARG, CAST_BINOP_ARGS, CAST_CONV_ARG, ASSIGNOPDECL, NULLASSIGNOPDECL, ASSIGNANYOPDECL, DEFASSIGNOP, DEFASSIGNOP_FN, UNOPDECL, BINOPDECL, CATOPDECL): Delete macros. * make_int.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-flt-cx-diag.cc, ov-flt-re-diag.cc, ov-lazy-idx.cc, ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-scalar.cc, ov-str-mat.cc, op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-dm-template.cc, op-dms-template.cc, op-fcdm-fcdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc, op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-int-conv.cc, op-int.h, op-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc, op-range.cc, op-s-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc, ops.h: Expand eliminated macros in place.

author	John W. Eaton <jwe@octave.org>
date	Wed, 27 Apr 2016 16:13:40 -0400
parents	40de9f8f23a6
children	aba2e6293dd8

rev	line source
4669 334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	1 /*
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	2
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	3 Copyright (C) 2003-2015 John W. Eaton
4669 334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	4
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	6
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	8 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5307 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5307 diff changeset	10 option) any later version.
4669 334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	11
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	15 for more details.
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	16
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5307 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5307 diff changeset	19 <http://www.gnu.org/licenses/>.
4669 334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	20
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	21 */
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	22
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	23 #ifdef HAVE_CONFIG_H
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	24 # include "config.h"
4669 334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	25 #endif
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	26
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 20940 diff changeset	27 #include "errwarn.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 19697 diff changeset	28 #include "ovl.h"
4669 334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	29 #include "ov.h"
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	30 #include "ov-bool.h"
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	31 #include "ov-bool-mat.h"
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4669 diff changeset	32 #include "ov-scalar.h"
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	33 #include "ov-float.h"
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4669 diff changeset	34 #include "ov-re-mat.h"
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	35 #include "ov-flt-re-mat.h"
4669 334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	36 #include "ov-typeinfo.h"
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	37 #include "ops.h"
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	38 #include "xdiv.h"
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	39 #include "xpow.h"
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	40
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	41 // bool matrix by bool ops.
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	42
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	43 DEFNDBINOP_FN (el_and, bool, bool_matrix, bool, bool_array, mx_el_and)
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	44 DEFNDBINOP_FN (el_or, bool, bool_matrix, bool, bool_array, mx_el_or)
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	45
8982 dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	46 DEFNDBINOP_FN (el_and_not, bool, bool_matrix, bool, bool_array, mx_el_and_not)
dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	47 DEFNDBINOP_FN (el_or_not, bool, bool_matrix, bool, bool_array, mx_el_or_not)
dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	48
4964 269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4915 diff changeset	49 DEFNDCATOP_FN (b_bm, bool, bool_matrix, bool_array, bool_array, concat)
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4669 diff changeset	50 DEFNDCATOP_FN (b_m, bool, matrix, array, array, concat)
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4669 diff changeset	51 DEFNDCATOP_FN (s_bm, scalar, bool_matrix, array, array, concat)
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4669 diff changeset	52
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	53 DEFNDCATOP_FN (b_fm, bool, float_matrix, float_array, float_array, concat)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	54 DEFNDCATOP_FN (f_bm, float_scalar, bool_matrix, float_array, float_array,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	55 concat)
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	56
4964 269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4915 diff changeset	57 DEFCONV (bool_matrix_conv, bool, bool_matrix)
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4915 diff changeset	58 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	59 const octave_bool& v = dynamic_cast<const octave_bool&> (a);
4964 269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4915 diff changeset	60
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4915 diff changeset	61 return new octave_bool_matrix (v.bool_matrix_value ());
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4915 diff changeset	62 }
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4915 diff changeset	63
4669 334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	64 void
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	65 install_b_bm_ops (void)
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	66 {
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	67 INSTALL_BINOP (op_el_and, octave_bool, octave_bool_matrix, el_and);
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	68 INSTALL_BINOP (op_el_or, octave_bool, octave_bool_matrix, el_or);
8993 6769599e3458 add missing binops installs Jaroslav Hajek <highegg@gmail.com> parents: 8982 diff changeset	69 INSTALL_BINOP (op_el_and_not, octave_bool, octave_bool_matrix, el_and_not);
6769599e3458 add missing binops installs Jaroslav Hajek <highegg@gmail.com> parents: 8982 diff changeset	70 INSTALL_BINOP (op_el_or_not, octave_bool, octave_bool_matrix, el_or_not);
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4669 diff changeset	71
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4669 diff changeset	72 INSTALL_CATOP (octave_bool, octave_bool_matrix, b_bm);
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4669 diff changeset	73 INSTALL_CATOP (octave_bool, octave_matrix, b_m);
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4669 diff changeset	74 INSTALL_CATOP (octave_scalar, octave_bool_matrix, s_bm);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	75 INSTALL_CATOP (octave_bool, octave_float_matrix, b_fm);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	76 INSTALL_CATOP (octave_float_scalar, octave_bool_matrix, f_bm);
4964 269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4915 diff changeset	77
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4915 diff changeset	78 INSTALL_ASSIGNCONV (octave_bool, octave_bool_matrix, octave_bool_matrix);
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4915 diff changeset	79
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4915 diff changeset	80 INSTALL_WIDENOP (octave_bool, octave_bool_matrix, bool_matrix_conv);
4669 334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: diff changeset	81 }

Mercurial > octave

annotate libinterp/operators/op-b-bm.cc @ 21647:66cae7a6dc47