Mercurial > hg > octave-nkf

comparison libinterp/corefcn/bitfcns.cc @ 20071:17d647821d61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: More cleanup of C++ code to follow Octave coding conventions. * gl-select.cc, betainc.cc, bitfcns.cc, bsxfun.cc, gl-render.cc, graphics.cc, load-save.cc, ls-mat-ascii.cc, ls-mat5.cc, lu.cc, oct-stream.cc, symtab.cc, variables.cc, __eigs__.cc, __magick_read__.cc, chol.cc, ov-base-sparse.cc, ov-class.cc, ov-classdef.cc, ov-fcn-inline.cc, ov-perm.cc, ov.cc, CMatrix.cc, CSparse.cc, MSparse.cc, MatrixType.cc, MatrixType.h, dMatrix.cc, dSparse.cc, fCMatrix.cc, fMatrix.cc, eigs-base.cc, lo-sysdep.cc, kpse.cc: Break long lines before && and ||.
author John W. Eaton <jwe@octave.org>
date Thu, 26 Feb 2015 13:07:04 -0500
parents 4197fc428c7d
children 4f45eaf83908
comparison
equal deleted inserted replaced
20070:09ed6f7538dd 20071:17d647821d61
129 129
130 //else (fname == "bitxor") 130 //else (fname == "bitxor")
131 return bitopxx (std::bit_xor<T>(), fname, x, y); 131 return bitopxx (std::bit_xor<T>(), fname, x, y);
132 } 132 }
133 133
134 static inline int
135 bitop_arg_is_int (const octave_value& arg)
136 {
137 return (arg.class_name () != octave_scalar::static_class_name ()
138 && arg.class_name () != octave_float_scalar::static_class_name ()
139 && arg.class_name () != octave_bool::static_class_name ());
140 }
141
142 static inline int
143 bitop_arg_is_bool (const octave_value& arg)
144 {
145 return arg.class_name () == octave_bool::static_class_name ();
146 }
147
148 static inline int
149 bitop_arg_is_float (const octave_value& arg)
150 {
151 return arg.class_name () == octave_float_scalar::static_class_name ();
152 }
153
134 octave_value 154 octave_value
135 bitop (const std::string& fname, const octave_value_list& args) 155 bitop (const std::string& fname, const octave_value_list& args)
136 { 156 {
137 octave_value retval; 157 octave_value retval;
138 158
139 int nargin = args.length (); 159 int nargin = args.length ();
140 160
141 if (nargin == 2) 161 if (nargin == 2)
142 { 162 {
143 if ((args(0).class_name () == octave_scalar::static_class_name ()) 163 if (args(0).class_name () == octave_scalar::static_class_name ()
144 || (args(0).class_name () == octave_float_scalar::static_class_name ()) 164 || args(0).class_name () == octave_float_scalar::static_class_name ()
145 || (args(0).class_name () == octave_bool::static_class_name ()) 165 || args(0).class_name () == octave_bool::static_class_name ()
146 || (args(1).class_name () == octave_scalar::static_class_name ()) 166 || args(1).class_name () == octave_scalar::static_class_name ()
147 || (args(1).class_name () == octave_float_scalar::static_class_name ()) 167 || args(1).class_name () == octave_float_scalar::static_class_name ()
148 || (args(1).class_name () == octave_bool::static_class_name ())) 168 || args(1).class_name () == octave_bool::static_class_name ())
149 { 169 {
150 bool arg0_is_int = (args(0).class_name () != 170 bool arg0_is_int = bitop_arg_is_int (args(0));
151 octave_scalar::static_class_name () && 171 bool arg1_is_int = bitop_arg_is_int (args(1));
152 args(0).class_name () != 172
153 octave_float_scalar::static_class_name () && 173 bool arg0_is_bool = bitop_arg_is_bool (args(0));
154 args(0).class_name () != 174 bool arg1_is_bool = bitop_arg_is_bool (args(1));
155 octave_bool::static_class_name ()); 175
156 bool arg1_is_int = (args(1).class_name () != 176 bool arg0_is_float = bitop_arg_is_float (args(0));
157 octave_scalar::static_class_name () && 177 bool arg1_is_float = bitop_arg_is_float (args(1));
158 args(1).class_name () !=
159 octave_float_scalar::static_class_name () &&
160 args(1).class_name () !=
161 octave_bool::static_class_name ());
162 bool arg0_is_bool = args(0).class_name () ==
163 octave_bool::static_class_name ();
164 bool arg1_is_bool = args(1).class_name () ==
165 octave_bool::static_class_name ();
166 bool arg0_is_float = args(0).class_name () ==
167 octave_float_scalar::static_class_name ();
168 bool arg1_is_float = args(1).class_name () ==
169 octave_float_scalar::static_class_name ();
170 178
171 if (! (arg0_is_int || arg1_is_int)) 179 if (! (arg0_is_int || arg1_is_int))
172 { 180 {
173 if (arg0_is_bool && arg1_is_bool) 181 if (arg0_is_bool && arg1_is_bool)
174 { 182 {