Mercurial > octave

comparison libinterp/operators/op-struct.cc @ 31867:a9c8b1f8fb32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use macro to simplify octave_base_value casts in operator functions * ops.h (OCTAVE_DYNAMIC_CAST): Rename from DYNORSTAT_CAST. (OCTAVE_CAST_BASE_VALUE): New macro. * op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.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.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-mi.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: Replace lines like "T& v = DYNORSTAT_CAST<T&> (a)" with "OCTAVE_CAST_BASE_VALUE (T&, v, a)".
author John W. Eaton <jwe@octave.org>
date Tue, 28 Feb 2023 15:45:03 -0500
parents 3722c5b1a8c8
children 2f3b54f81947 2e484f9f1f18
comparison
equal deleted inserted replaced
31866:3722c5b1a8c8 31867:a9c8b1f8fb32
39 39
40 // struct ops. 40 // struct ops.
41 41
42 DEFUNOP (transpose, struct) 42 DEFUNOP (transpose, struct)
43 { 43 {
44 const octave_struct& v = DYNORSTAT_CAST<const octave_struct&> (a); 44 OCTAVE_CAST_BASE_VALUE (const octave_struct&, v, a);
45 45
46 if (v.ndims () > 2) 46 if (v.ndims () > 2)
47 error ("transpose not defined for N-D objects"); 47 error ("transpose not defined for N-D objects");
48 48
49 return octave_value (v.map_value ().transpose ()); 49 return octave_value (v.map_value ().transpose ());
50 } 50 }
51 51
52 DEFUNOP (scalar_transpose, scalar_struct) 52 DEFUNOP (scalar_transpose, scalar_struct)
53 { 53 {
54 const octave_scalar_struct& v = DYNORSTAT_CAST<const octave_scalar_struct&> (a); 54 OCTAVE_CAST_BASE_VALUE (const octave_scalar_struct&, v, a);
55 55
56 return octave_value (v.scalar_map_value ()); 56 return octave_value (v.scalar_map_value ());
57 } 57 }
58 58
59 DEFNDCATOP_FN (s_s_concat, struct, struct, map, map, concat) 59 DEFNDCATOP_FN (s_s_concat, struct, struct, map, map, concat)
64 static octave_value 64 static octave_value
65 oct_catop_struct_matrix (const octave_base_value& a1, 65 oct_catop_struct_matrix (const octave_base_value& a1,
66 const octave_base_value& a2, 66 const octave_base_value& a2,
67 const Array<octave_idx_type>&) 67 const Array<octave_idx_type>&)
68 { 68 {
69 const octave_struct& v1 = DYNORSTAT_CAST<const octave_struct&> (a1); 69 OCTAVE_CAST_BASE_VALUE (const octave_struct&, v1, a1);
70 const octave_matrix& v2 = DYNORSTAT_CAST<const octave_matrix&> (a2); 70 OCTAVE_CAST_BASE_VALUE (const octave_matrix&, v2, a2);
71 71
72 NDArray tmp = v2.array_value (); 72 NDArray tmp = v2.array_value ();
73 dim_vector dv = tmp.dims (); 73 dim_vector dv = tmp.dims ();
74 74
75 if (! dv.all_zero ()) 75 if (! dv.all_zero ())
81 static octave_value 81 static octave_value
82 oct_catop_matrix_struct (const octave_base_value& a1, 82 oct_catop_matrix_struct (const octave_base_value& a1,
83 const octave_base_value& a2, 83 const octave_base_value& a2,
84 const Array<octave_idx_type>&) 84 const Array<octave_idx_type>&)
85 { 85 {
86 const octave_matrix& v1 = DYNORSTAT_CAST<const octave_matrix&> (a1); 86 OCTAVE_CAST_BASE_VALUE (const octave_matrix&, v1, a1);
87 const octave_struct& v2 = DYNORSTAT_CAST<const octave_struct&> (a2); 87 OCTAVE_CAST_BASE_VALUE (const octave_struct&, v2, a2);
88 88
89 NDArray tmp = v1.array_value (); 89 NDArray tmp = v1.array_value ();
90 dim_vector dv = tmp.dims (); 90 dim_vector dv = tmp.dims ();
91 91
92 if (! dv.all_zero ()) 92 if (! dv.all_zero ())