Mercurial > octave-antonio

comparison libinterp/octave-value/ov.cc @ 19864: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 19755f4fc851
children 075a5e2e1ba5
comparison
equal deleted inserted replaced
19863:09ed6f7538dd 19864:17d647821d61
2034 octave_value tv2; 2034 octave_value tv2;
2035 octave_base_value::type_conv_info cf2 = 2035 octave_base_value::type_conv_info cf2 =
2036 v2.numeric_conversion_function (); 2036 v2.numeric_conversion_function ();
2037 2037
2038 // Try biased (one-sided) conversions first. 2038 // Try biased (one-sided) conversions first.
2039 if (cf2.type_id () >= 0 && 2039 if (cf2.type_id () >= 0
2040 octave_value_typeinfo::lookup_binary_op (op, t1, cf2.type_id ())) 2040 && octave_value_typeinfo::lookup_binary_op (op, t1,
2041 cf2.type_id ()))
2041 cf1 = 0; 2042 cf1 = 0;
2042 else if (cf1.type_id () >= 0 2043 else if (cf1.type_id () >= 0
2043 && octave_value_typeinfo::lookup_binary_op (op, 2044 && octave_value_typeinfo::lookup_binary_op (op,
2044 cf1.type_id (), 2045 cf1.type_id (),
2045 t2)) 2046 t2))
2095 // Try biased (one-sided) conversions first. 2096 // Try biased (one-sided) conversions first.
2096 if (cf2.type_id () >= 0 2097 if (cf2.type_id () >= 0
2097 && octave_value_typeinfo::lookup_binary_op (op, t1, 2098 && octave_value_typeinfo::lookup_binary_op (op, t1,
2098 cf2.type_id ())) 2099 cf2.type_id ()))
2099 cf1 = 0; 2100 cf1 = 0;
2100 else if (cf1.type_id () >= 0 && 2101 else if (cf1.type_id () >= 0
2101 octave_value_typeinfo::lookup_binary_op (op, 2102 && octave_value_typeinfo::lookup_binary_op (op,
2102 cf1.type_id (), 2103 cf1.type_id (),
2103 t2)) 2104 t2))
2104 cf2 = 0; 2105 cf2 = 0;
2105 2106
2106 if (cf1) 2107 if (cf1)
2107 { 2108 {
2108 octave_base_value *tmp = cf1 (*tv1.rep); 2109 octave_base_value *tmp = cf1 (*tv1.rep);