Mercurial > octave
diff libinterp/corefcn/fcn-info.cc @ 27277:db687716fed6
style fixes: generally aim to break long lines before operators, not after
Files affected: Table.cc, dw-main-window.cc, file-editor-tab.cc,
file-editor.cc, main-window.cc, build-env.in.cc, __ichol__.cc,
__magick_read__.cc, besselj.cc, bsxfun.cc, cellfun.cc, data.cc,
dlmread.cc, error.cc, fcn-info.cc, file-io.cc, gl-render.cc,
gl2ps-print.cc, graphics.cc, load-save.cc, ls-mat4.cc, ls-mat5.cc,
matrix_type.cc, mex.cc, oct-stream.cc, pr-output.cc, quadcc.cc,
rand.cc, sparse-xpow.cc, syscalls.cc, sysdep.cc, utils.cc,
__init_fltk__.cc, __init_gnuplot__.cc, chol.cc, fftw.cc, qr.cc,
cdef-class.cc, cdef-object.cc, ov-bool-sparse.cc, ov-cell.cc,
ov-class.cc, ov-cx-diag.cc, ov-cx-sparse.cc, ov-fcn-handle.cc,
ov-flt-cx-diag.cc, ov-flt-re-diag.cc, ov-str-mat.cc, ov-struct.cc,
ov.cc, op-b-sbm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-scm-scm.cc,
op-sm-scm.cc, op-sm-sm.cc, jit-typeinfo.cc, pt-cbinop.cc, pt-cbinop.h,
pt-eval.cc, CSparse.cc, MatrixType.cc, dSparse.cc, eigs-base.cc,
lo-specfun.cc, oct-fftw.cc, cmd-edit.cc, lo-regexp.cc, oct-inttypes.h,
url-transfer.cc, mkoctfile.in.cc, and octave-svgconvert.cc.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 21 Jul 2019 10:21:01 -0400 |
| parents | 85233937b6b7 |
| children | 9b19eec60931 |
line wrap: on
line diff
--- a/libinterp/corefcn/fcn-info.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/fcn-info.cc Sun Jul 21 10:21:01 2019 -0400 @@ -201,8 +201,8 @@ symbol_table& symtab = __get_symbol_table__ ("fcn_info::fcn_info_rep::load_class_method"); - const std::list<std::string>& plist = - symtab.parent_classes (dispatch_type); + const std::list<std::string>& plist + = symtab.parent_classes (dispatch_type); auto it = plist.begin (); @@ -256,15 +256,15 @@ builtin_type_t ityp = static_cast<builtin_type_t> (i); builtin_type_t jtyp = static_cast<builtin_type_t> (j); // FIXME: Is this really right? - bool use_j = - (jtyp == btyp_func_handle || ityp == btyp_bool - || (btyp_isarray (ityp) - && (! btyp_isarray (jtyp) - || (btyp_isinteger (jtyp) && ! btyp_isinteger (ityp)) - || ((ityp == btyp_double || ityp == btyp_complex - || ityp == btyp_char) - && (jtyp == btyp_float - || jtyp == btyp_float_complex))))); + bool use_j + = (jtyp == btyp_func_handle || ityp == btyp_bool + || (btyp_isarray (ityp) + && (! btyp_isarray (jtyp) + || (btyp_isinteger (jtyp) && ! btyp_isinteger (ityp)) + || ((ityp == btyp_double || ityp == btyp_complex + || ityp == btyp_char) + && (jtyp == btyp_float + || jtyp == btyp_float_complex))))); sup_table[i][j] = (use_j ? jtyp : ityp); } @@ -1004,16 +1004,16 @@ { std::string dir_name; - load_path& lp = - __get_load_path__ ("fcn_info::fcn_info_rep::find_user_function"); + load_path& lp + = __get_load_path__ ("fcn_info::fcn_info_rep::find_user_function"); std::string file_name = lp.find_fcn (name, dir_name, package_name); if (! file_name.empty ()) { - octave_value ov_fcn = - load_fcn_from_file (file_name, dir_name, "", package_name); + octave_value ov_fcn + = load_fcn_from_file (file_name, dir_name, "", package_name); if (ov_fcn.is_defined ()) function_on_path = ov_fcn;