comparison src/bitfcns.cc @ 4952:bfd57b466752

[project @ 2004-09-01 00:49:05 by jwe]
author jwe
date Wed, 01 Sep 2004 00:49:06 +0000
parents b22a7a1db0d5
children b6ff3a0d3d17
comparison
equal deleted inserted replaced
4951:0a21e1bf18c4 4952:bfd57b466752
84 \ 84 \
85 int nargin = args.length (); \ 85 int nargin = args.length (); \
86 \ 86 \
87 if (nargin == 2) \ 87 if (nargin == 2) \
88 { \ 88 { \
89 if (args(0).type_id () == octave_matrix::static_type_id () \ 89 if ((args(0).class_name () == octave_scalar::static_class_name ()) \
90 || args(0).type_id () == octave_scalar::static_type_id () \ 90 || (args(1).class_name () == octave_scalar::static_class_name ())) \
91 || args(1).type_id () == octave_matrix::static_type_id () \
92 || args(1).type_id () == octave_scalar::static_type_id ()) \
93 { \ 91 { \
94 bool arg0_is_int = true; \ 92 bool arg0_is_int = (args(0).class_name () != \
95 bool arg1_is_int = true; \ 93 octave_scalar::static_class_name ()); \
96 \ 94 bool arg1_is_int = (args(1).class_name () != \
97 if (args(0).type_id () == octave_matrix::static_type_id () \ 95 octave_scalar::static_class_name ()); \
98 || args(0).type_id () == octave_scalar::static_type_id ()) \ 96 \
99 arg0_is_int = false; \ 97 if (! (arg0_is_int || arg1_is_int)) \
100 \
101 if (args(1).type_id () == octave_matrix::static_type_id () \
102 || args(1).type_id () == octave_scalar::static_type_id ()) \
103 arg1_is_int = false; \
104 \
105 if (!arg0_is_int && !arg1_is_int) \
106 { \ 98 { \
107 uint64NDArray x (args(0).array_value ()); \ 99 uint64NDArray x (args(0).array_value ()); \
108 uint64NDArray y (args(1).array_value ()); \ 100 uint64NDArray y (args(1).array_value ()); \
109 if (! error_state) \ 101 if (! error_state) \
110 BITOPX (OP, FNAME, uint64NDArray); \ 102 BITOPX (OP, FNAME, uint64NDArray); \
183 } \ 175 } \
184 else \ 176 else \
185 error ("%s: invalid operand type", FNAME); \ 177 error ("%s: invalid operand type", FNAME); \
186 } \ 178 } \
187 } \ 179 } \
188 else if (args(0).type_id () == args(1).type_id ()) \ 180 else if (args(0).class_name () == args(1).class_name ()) \
189 { \ 181 { \
190 if (args(0).type_id () == octave_uint64_matrix::static_type_id () \ 182 if (args(0).type_id () == octave_uint64_matrix::static_type_id () \
191 || args(0).type_id () == octave_uint64_scalar::static_type_id ()) \ 183 || args(0).type_id () == octave_uint64_scalar::static_type_id ()) \
192 { \ 184 { \
193 uint64NDArray x = args(0).uint64_array_value (); \ 185 uint64NDArray x = args(0).uint64_array_value (); \