Mercurial > octave

comparison libinterp/operators/op-str-str.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
comparison
equal deleted inserted replaced
21646:3cddf1e65ccf 21647:66cae7a6dc47
34 34
35 // string unary ops. 35 // string unary ops.
36 36
37 DEFUNOP (transpose, char_matrix_str) 37 DEFUNOP (transpose, char_matrix_str)
38 { 38 {
39 CAST_UNOP_ARG (const octave_char_matrix_str&); 39 const octave_char_matrix_str& v = dynamic_cast<const octave_char_matrix_str&> (a);
40 40
41 if (v.ndims () > 2) 41 if (v.ndims () > 2)
42 error ("transpose not defined for N-D objects"); 42 error ("transpose not defined for N-D objects");
43 43
44 return octave_value (v.char_matrix_value ().transpose (), 44 return octave_value (v.char_matrix_value ().transpose (),
46 } 46 }
47 47
48 // string by string ops. 48 // string by string ops.
49 49
50 #define DEFCHARNDBINOP_FN(name, op, t1, t2, e1, e2, f) \ 50 #define DEFCHARNDBINOP_FN(name, op, t1, t2, e1, e2, f) \
51 BINOPDECL (name, a1, a2) \ 51 static octave_value \
52 CONCAT2(oct_binop_, name) (const octave_base_value& a1, const octave_base_value& a2) \
52 { \ 53 { \
53 dim_vector a1_dims = a1.dims (); \ 54 dim_vector a1_dims = a1.dims (); \
54 dim_vector a2_dims = a2.dims (); \ 55 dim_vector a2_dims = a2.dims (); \
55 \ 56 \
56 bool a1_is_scalar = a1_dims.all_ones (); \ 57 bool a1_is_scalar = a1_dims.all_ones (); \
57 bool a2_is_scalar = a2_dims.all_ones (); \ 58 bool a2_is_scalar = a2_dims.all_ones (); \
58 \ 59 \
59 CAST_BINOP_ARGS (const octave_ ## t1&, const octave_ ## t2&); \ 60 const octave_ ## t1& v1 = dynamic_cast<const octave_ ## t1&> (a1); \
61 const octave_ ## t2& v2 = dynamic_cast<const octave_ ## t2&> (a2); \
60 \ 62 \
61 if (a1_is_scalar) \ 63 if (a1_is_scalar) \
62 { \ 64 { \
63 if (a2_is_scalar) \ 65 if (a2_is_scalar) \
64 return octave_value ((v1.e1 ## _value ())(0) op (v2.e2 ## _value ())(0)); \ 66 return octave_value ((v1.e1 ## _value ())(0) op (v2.e2 ## _value ())(0)); \
87 DEFCHARNDBINOP_FN (ne, !=, char_matrix_str, char_matrix_str, char_array, 89 DEFCHARNDBINOP_FN (ne, !=, char_matrix_str, char_matrix_str, char_array,
88 char_array, mx_el_ne) 90 char_array, mx_el_ne)
89 91
90 DEFASSIGNOP (assign, char_matrix_str, char_matrix_str) 92 DEFASSIGNOP (assign, char_matrix_str, char_matrix_str)
91 { 93 {
92 CAST_BINOP_ARGS (octave_char_matrix_str&, const octave_char_matrix_str&); 94 octave_char_matrix_str& v1 = dynamic_cast<octave_char_matrix_str&> (a1);
95 const octave_char_matrix_str& v2 = dynamic_cast<const octave_char_matrix_str&> (a2);
93 96
94 v1.assign (idx, v2.char_array_value ()); 97 v1.assign (idx, v2.char_array_value ());
95 return octave_value (); 98 return octave_value ();
96 } 99 }
97 100