Mercurial > octave

comparison libinterp/operators/op-chm.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
37 37
38 // char matrix unary ops. 38 // char matrix unary ops.
39 39
40 DEFUNOP (transpose, char_matrix) 40 DEFUNOP (transpose, char_matrix)
41 { 41 {
42 CAST_UNOP_ARG (const octave_char_matrix&); 42 const octave_char_matrix& v = dynamic_cast<const octave_char_matrix&> (a);
43 43
44 return octave_value (v.matrix_value ().transpose ()); 44 return octave_value (v.matrix_value ().transpose ());
45 } 45 }
46 46
47 DEFNDCATOP_FN (chm_chm, char_matrix, char_matrix, char_array, char_array, 47 DEFNDCATOP_FN (chm_chm, char_matrix, char_matrix, char_array, char_array,
48 concat) 48 concat)
49 49
50 DEFCATOP (chm_s, char_matrix, scalar) 50 DEFCATOP (chm_s, char_matrix, scalar)
51 { 51 {
52 CAST_BINOP_ARGS (octave_char_matrix&, const octave_scalar&); 52 octave_char_matrix& v1 = dynamic_cast<octave_char_matrix&> (a1);
53 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);
53 54
54 warn_implicit_conversion ("Octave:num-to-str", 55 warn_implicit_conversion ("Octave:num-to-str",
55 v2.type_name (), v1.type_name ()); 56 v2.type_name (), v1.type_name ());
56 57
57 return octave_value (v1.char_array_value (). concat (v2.array_value (), 58 return octave_value (v1.char_array_value (). concat (v2.array_value (),
58 ra_idx)); 59 ra_idx));
59 } 60 }
60 61
61 DEFCATOP (chm_m, char_matrix, matrix) 62 DEFCATOP (chm_m, char_matrix, matrix)
62 { 63 {
63 CAST_BINOP_ARGS (octave_char_matrix&, const octave_matrix&); 64 octave_char_matrix& v1 = dynamic_cast<octave_char_matrix&> (a1);
65 const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2);
64 66
65 warn_implicit_conversion ("Octave:num-to-str", 67 warn_implicit_conversion ("Octave:num-to-str",
66 v2.type_name (), v1.type_name ()); 68 v2.type_name (), v1.type_name ());
67 69
68 return octave_value (v1.char_array_value (). concat (v2.array_value (), 70 return octave_value (v1.char_array_value (). concat (v2.array_value (),
69 ra_idx)); 71 ra_idx));
70 } 72 }
71 73
72 DEFCATOP (s_chm, scalar, char_matrix) 74 DEFCATOP (s_chm, scalar, char_matrix)
73 { 75 {
74 CAST_BINOP_ARGS (octave_scalar&, const octave_char_matrix&); 76 octave_scalar& v1 = dynamic_cast<octave_scalar&> (a1);
77 const octave_char_matrix& v2 = dynamic_cast<const octave_char_matrix&> (a2);
75 78
76 warn_implicit_conversion ("Octave:num-to-str", 79 warn_implicit_conversion ("Octave:num-to-str",
77 v1.type_name (), v2.type_name ()); 80 v1.type_name (), v2.type_name ());
78 81
79 return octave_value (v1.array_value (). concat (v2.char_array_value (), 82 return octave_value (v1.array_value (). concat (v2.char_array_value (),
80 ra_idx)); 83 ra_idx));
81 } 84 }
82 85
83 DEFCATOP (m_chm, matrix, char_matrix) 86 DEFCATOP (m_chm, matrix, char_matrix)
84 { 87 {
85 CAST_BINOP_ARGS (octave_matrix&, const octave_char_matrix&); 88 octave_matrix& v1 = dynamic_cast<octave_matrix&> (a1);
89 const octave_char_matrix& v2 = dynamic_cast<const octave_char_matrix&> (a2);
86 90
87 warn_implicit_conversion ("Octave:num-to-str", 91 warn_implicit_conversion ("Octave:num-to-str",
88 v1.type_name (), v2.type_name ()); 92 v1.type_name (), v2.type_name ());
89 93
90 return octave_value (v1.array_value (). concat (v2.char_array_value (), 94 return octave_value (v1.array_value (). concat (v2.char_array_value (),