Mercurial > octave
diff examples/code/make_int.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 | 6c2fd62db1f7 |
| children | aba2e6293dd8 |
line wrap: on
line diff
--- a/examples/code/make_int.cc Wed Apr 27 09:31:39 2016 -0400 +++ b/examples/code/make_int.cc Wed Apr 27 16:13:40 2016 -0400 @@ -124,9 +124,10 @@ #endif #define DEFUNOP_OP(name, t, op) \ - UNOPDECL (name, a) \ + static octave_value \ + CONCAT2(oct_unop_, name) (const octave_base_value& a) \ { \ - CAST_UNOP_ARG (const octave_ ## t&); \ + const octave_ ## t& v = dynamic_cast<const octave_ ## t&> (a); \ return octave_value (new octave_integer (op v.t ## _value ())); \ } @@ -143,9 +144,11 @@ #endif #define DEFBINOP_OP(name, t1, t2, op) \ - BINOPDECL (name, a1, a2) \ + static octave_value \ + CONCAT2(oct_binop_, name) (const octave_base_value& a1, const octave_base_value& a2) \ { \ - CAST_BINOP_ARGS (const octave_ ## t1&, const octave_ ## t2&); \ + const octave_ ## t1& v1 = dynamic_cast<const octave_ ## t1&> (a1); \ + const octave_ ## t2& v2 = dynamic_cast<const octave_ ## t2&> (a2); \ return octave_value \ (new octave_integer (v1.t1 ## _value () op v2.t2 ## _value ())); \ } @@ -158,7 +161,8 @@ DEFBINOP (div, integer, integer) { - CAST_BINOP_ARGS (const octave_integer&, const octave_integer&); + const octave_integer& v1 = dynamic_cast<const octave_integer&> (a1); + const octave_integer& v2 = dynamic_cast<const octave_integer&> (a2); int d = v2.integer_value (); @@ -171,7 +175,8 @@ DEFBINOP (i_s_div, integer, scalar) { - CAST_BINOP_ARGS (const octave_integer&, const octave_scalar&); + const octave_integer& v1 = dynamic_cast<const octave_integer&> (a1); + const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); double d = v2.double_value (); @@ -183,7 +188,8 @@ DEFBINOP (ldiv, integer, integer) { - CAST_BINOP_ARGS (const octave_integer&, const octave_integer&); + const octave_integer& v1 = dynamic_cast<const octave_integer&> (a1); + const octave_integer& v2 = dynamic_cast<const octave_integer&> (a2); int d = v1.integer_value (); @@ -204,7 +210,8 @@ DEFBINOP (el_div, integer, integer) { - CAST_BINOP_ARGS (const octave_integer&, const octave_integer&); + const octave_integer& v1 = dynamic_cast<const octave_integer&> (a1); + const octave_integer& v2 = dynamic_cast<const octave_integer&> (a2); int d = v2.integer_value (); @@ -216,7 +223,8 @@ DEFBINOP (el_ldiv, integer, integer) { - CAST_BINOP_ARGS (const octave_integer&, const octave_integer&); + const octave_integer& v1 = dynamic_cast<const octave_integer&> (a1); + const octave_integer& v2 = dynamic_cast<const octave_integer&> (a2); int d = v1.integer_value ();