Mercurial > octave

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
10263
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
1 /*
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
2
19697
4197fc428c7d maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents: 17744
diff changeset
3 Copyright (C) 2010-2015 VZLU Prague
10263
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
4
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
5 This file is part of Octave.
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
6
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
7 Octave is free software; you can redistribute it and/or modify it
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
9 Free Software Foundation; either version 3 of the License, or (at your
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
10 option) any later version.
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
11
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
12 Octave is distributed in the hope that it will be useful, but WITHOUT
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
15 for more details.
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
16
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
18 along with Octave; see the file COPYING. If not, see
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
19 <http://www.gnu.org/licenses/>.
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
20
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
21 */
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
22
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
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"
10263
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
25 #endif
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
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"
10263
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
29 #include "ov.h"
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
30 #include "ov-fcn-handle.h"
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
31 #include "ov-scalar.h"
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
32 #include "ov-typeinfo.h"
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
33 #include "ops.h"
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
34
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
35 DEFBINOP (eq, fcn_handle, fcn_handle)
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
36 {
21647
66cae7a6dc47 eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents: 21301
diff changeset
37 const octave_fcn_handle& v1 = dynamic_cast<const octave_fcn_handle&> (a1);
66cae7a6dc47 eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents: 21301
diff changeset
38 const octave_fcn_handle& v2 = dynamic_cast<const octave_fcn_handle&> (a2);
10263
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
39
10322
21551cc88061 improve function handles comparison
Jaroslav Hajek <highegg@gmail.com>
parents: 10263
diff changeset
40 return v1.is_equal_to (v2);
21551cc88061 improve function handles comparison
Jaroslav Hajek <highegg@gmail.com>
parents: 10263
diff changeset
41 }
10263
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
42
10322
21551cc88061 improve function handles comparison
Jaroslav Hajek <highegg@gmail.com>
parents: 10263
diff changeset
43 DEFBINOP (ne, fcn_handle, fcn_handle)
21551cc88061 improve function handles comparison
Jaroslav Hajek <highegg@gmail.com>
parents: 10263
diff changeset
44 {
21647
66cae7a6dc47 eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents: 21301
diff changeset
45 const octave_fcn_handle& v1 = dynamic_cast<const octave_fcn_handle&> (a1);
66cae7a6dc47 eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents: 21301
diff changeset
46 const octave_fcn_handle& v2 = dynamic_cast<const octave_fcn_handle&> (a2);
10322
21551cc88061 improve function handles comparison
Jaroslav Hajek <highegg@gmail.com>
parents: 10263
diff changeset
47
21551cc88061 improve function handles comparison
Jaroslav Hajek <highegg@gmail.com>
parents: 10263
diff changeset
48 return ! v1.is_equal_to (v2);
10263
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
49 }
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
50
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
51 void
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
52 install_fcn_ops (void)
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
53 {
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
54 INSTALL_BINOP (op_eq, octave_fcn_handle, octave_fcn_handle, eq);
10322
21551cc88061 improve function handles comparison
Jaroslav Hajek <highegg@gmail.com>
parents: 10263
diff changeset
55 INSTALL_BINOP (op_ne, octave_fcn_handle, octave_fcn_handle, ne);
10263
07dedea2e0a4 add omitted file from 10260:14d5fee02b3b
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
56 }