Mercurial > octave
changeset 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.
line wrap: on
line diff
--- a/libgui/graphics/Table.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libgui/graphics/Table.cc Sun Jul 21 10:21:01 2019 -0400 @@ -1067,8 +1067,9 @@ uitable::properties& tp = properties<uitable> (); octave_value columnwidth = tp.get_columnwidth (); - if (columnwidth.isempty () || - (columnwidth.is_string () && columnwidth.string_value (false) == "auto")) + if (columnwidth.isempty () + || (columnwidth.is_string () + && columnwidth.string_value (false) == "auto")) for (int i = 0; i < m_tableWidget->columnCount (); i++) m_tableWidget->setColumnWidth (i, AUTO_WIDTH); else if (columnwidth.is_string ()
--- a/libgui/src/dw-main-window.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libgui/src/dw-main-window.cc Sun Jul 21 10:21:01 2019 -0400 @@ -220,8 +220,8 @@ // Reimplemented Event bool dw_main_window::event (QEvent *ev) { - if (ev->type () == QEvent::ChildAdded || - ev->type () == QEvent::ChildRemoved) + if (ev->type () == QEvent::ChildAdded + || ev->type () == QEvent::ChildRemoved) { // Adding or Removing a child indicates that a dock widget was // created or removed.
--- a/libgui/src/m-editor/file-editor-tab.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libgui/src/m-editor/file-editor-tab.cc Sun Jul 21 10:21:01 2019 -0400 @@ -726,8 +726,8 @@ if (apis_usable) f.close (); - if (apis_usable && - (update_apis || ! _lexer_apis->loadPrepared (_prep_apis_file))) + if (apis_usable + && (update_apis || ! _lexer_apis->loadPrepared (_prep_apis_file))) { // either we have decided to update the apis file or // no prepared info was loaded, prepare and save if possible
--- a/libgui/src/m-editor/file-editor.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libgui/src/m-editor/file-editor.cc Sun Jul 21 10:21:01 2019 -0400 @@ -987,8 +987,8 @@ QString old_name_clean = old_name.trimmed (); int s = old_name_clean.size (); - if (old_name_clean.at (0) == QChar ('\"') && - old_name_clean.at (s - 1) == QChar ('\"')) + if (old_name_clean.at (0) == QChar ('\"') + && old_name_clean.at (s - 1) == QChar ('\"')) old_name_clean = old_name_clean.mid (1, s - 2); QStringList old_names = old_name_clean.split ("\" \"");
--- a/libgui/src/main-window.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libgui/src/main-window.cc Sun Jul 21 10:21:01 2019 -0400 @@ -1526,9 +1526,8 @@ if (visible) { - if (settings && - settings->value ("DockWidgets/" + name - + "_minimized").toBool ()) + if (settings && settings->value ("DockWidgets/" + name + + "_minimized").toBool ()) widget->showMinimized (); else widget->setVisible (true);
--- a/libinterp/build-env.in.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/build-env.in.cc Sun Jul 21 10:21:01 2019 -0400 @@ -281,11 +281,9 @@ const char *SUNDIALS_IDA_LIBS = %OCTAVE_CONF_SUNDIALS_IDA_LIBS%; - const char *SUNDIALS_NVECSERIAL_CPPFLAGS = - %OCTAVE_CONF_SUNDIALS_NVECSERIAL_CPPFLAGS%; + const char *SUNDIALS_NVECSERIAL_CPPFLAGS = %OCTAVE_CONF_SUNDIALS_NVECSERIAL_CPPFLAGS%; - const char *SUNDIALS_NVECSERIAL_LDFLAGS = - %OCTAVE_CONF_SUNDIALS_NVECSERIAL_LDFLAGS%; + const char *SUNDIALS_NVECSERIAL_LDFLAGS = %OCTAVE_CONF_SUNDIALS_NVECSERIAL_LDFLAGS%; const char *SUNDIALS_NVECSERIAL_LIBS = %OCTAVE_CONF_SUNDIALS_NVECSERIAL_LIBS%;
--- a/libinterp/corefcn/__ichol__.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/__ichol__.cc Sun Jul 21 10:21:01 2019 -0400 @@ -204,8 +204,8 @@ } else { - SparseComplexMatrix sm = - Ftril (args(0))(0).sparse_complex_matrix_value (); + SparseComplexMatrix sm + = Ftril (args(0))(0).sparse_complex_matrix_value (); ichol_0 <SparseComplexMatrix, Complex, ichol_mult_complex, ichol_checkpivot_complex> (sm, michol); return ovl (sm); @@ -440,8 +440,8 @@ else { SparseComplexMatrix L; - SparseComplexMatrix sm_l = - Ftril (args(0))(0).sparse_complex_matrix_value (); + SparseComplexMatrix sm_l + = Ftril (args(0))(0).sparse_complex_matrix_value (); Array <Complex> cols_norm = xcolnorms (sm_l, 1); ichol_t <SparseComplexMatrix, Complex, ichol_mult_complex, ichol_checkpivot_complex>
--- a/libinterp/corefcn/__magick_read__.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/__magick_read__.cc Sun Jul 21 10:21:01 2019 -0400 @@ -93,8 +93,8 @@ // always has a value in libpng so if we get nothing, we assume this // GM version does not store them and we have to go with whatever // GM PseudoClass says. - const std::string color_type = - const_cast<Magick::Image&> (img).attribute ("PNG:IHDR.color-type-orig"); + const std::string color_type + = const_cast<Magick::Image&> (img).attribute ("PNG:IHDR.color-type-orig"); if (! color_type.empty () && color_type != "3") indexed = false; } @@ -331,8 +331,8 @@ // return the colormap of the first frame. To obtain the colormaps // of different frames, one needs can either use imfinfo or a for // loop around imread. - const octave_value_list maps = - read_maps (const_cast<Magick::Image&> (imvec[frameidx(def_elem)])); + const octave_value_list maps + = read_maps (const_cast<Magick::Image&> (imvec[frameidx(def_elem)])); retval(1) = maps(0); @@ -959,8 +959,8 @@ bitdepth_from_class () { typedef typename T::element_type P; - const octave_idx_type bitdepth = - sizeof (P) * std::numeric_limits<unsigned char>::digits; + const octave_idx_type bitdepth + = sizeof (P) * std::numeric_limits<unsigned char>::digits; return bitdepth; } @@ -1550,10 +1550,10 @@ const octave_idx_type nFrames = imvec.size (); const octave_idx_type quality = options.getfield ("quality").int_value (); - const ColumnVector delaytime = - options.getfield ("delaytime").column_vector_value (); - const Array<std::string> disposalmethod = - options.getfield ("disposalmethod").cellstr_value (); + const ColumnVector delaytime + = options.getfield ("delaytime").column_vector_value (); + const Array<std::string> disposalmethod + = options.getfield ("disposalmethod").cellstr_value (); for (octave_idx_type i = 0; i < nFrames; i++) { imvec[i].quality (quality); @@ -2014,8 +2014,7 @@ if (is_indexed (img)) { color_type = "indexed"; - cmap = - read_maps (const_cast<Magick::Image&> (img))(0).matrix_value (); + cmap = read_maps (const_cast<Magick::Image&> (img))(0).matrix_value (); } else {
--- a/libinterp/corefcn/besselj.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/besselj.cc Sun Jul 21 10:21:01 2019 -0400 @@ -158,8 +158,8 @@ { FloatRowVector ralpha = args(0).xfloat_row_vector_value ("%s: ALPHA must be a scalar or matrix", fn); - FloatComplexColumnVector cx = - x_arg.xfloat_complex_column_vector_value ("%s: X must be a scalar or matrix", fn); + FloatComplexColumnVector cx + = x_arg.xfloat_complex_column_vector_value ("%s: X must be a scalar or matrix", fn); Array<octave_idx_type> ierr; octave_value result; @@ -248,8 +248,8 @@ { RowVector ralpha = args(0).xrow_vector_value ("%s: ALPHA must be a scalar or matrix", fn); - ComplexColumnVector cx = - x_arg.xcomplex_column_vector_value ("%s: X must be a scalar or matrix", fn); + ComplexColumnVector cx + = x_arg.xcomplex_column_vector_value ("%s: X must be a scalar or matrix", fn); Array<octave_idx_type> ierr; octave_value result;
--- a/libinterp/corefcn/bsxfun.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/bsxfun.cc Sun Jul 21 10:21:01 2019 -0400 @@ -173,10 +173,10 @@ REGISTER_OP_HANDLER (bsxfun_builtin_or, btyp_bool, boolNDArray, bsxfun_or); // Register power handlers. - bsxfun_handler_table[bsxfun_builtin_power][btyp_double] = - do_bsxfun_real_pow<NDArray, ComplexNDArray>; - bsxfun_handler_table[bsxfun_builtin_power][btyp_float] = - do_bsxfun_real_pow<FloatNDArray, FloatComplexNDArray>; + bsxfun_handler_table[bsxfun_builtin_power][btyp_double] + = do_bsxfun_real_pow<NDArray, ComplexNDArray>; + bsxfun_handler_table[bsxfun_builtin_power][btyp_float] + = do_bsxfun_real_pow<FloatNDArray, FloatComplexNDArray>; REGISTER_OP_HANDLER (bsxfun_builtin_power, btyp_complex, ComplexNDArray, bsxfun_pow); @@ -485,8 +485,8 @@ else { have_ComplexNDArray = true; - result_ComplexNDArray = - tmp(0).complex_array_value (); + result_ComplexNDArray + = tmp(0).complex_array_value (); result_ComplexNDArray.resize (dvc); } } @@ -495,15 +495,15 @@ if (tmp(0).isreal ()) { have_FloatNDArray = true; - result_FloatNDArray = - tmp(0).float_array_value (); + result_FloatNDArray + = tmp(0).float_array_value (); result_FloatNDArray.resize (dvc); } else { have_FloatComplexNDArray = true; - result_FloatComplexNDArray = - tmp(0).float_complex_array_value (); + result_FloatComplexNDArray + = tmp(0).float_complex_array_value (); result_FloatComplexNDArray.resize (dvc); } } @@ -544,8 +544,8 @@ result_NDArray.insert (tmp(0).array_value (), ra_idx); else { - result_ComplexNDArray = - ComplexNDArray (result_NDArray); + result_ComplexNDArray + = ComplexNDArray (result_NDArray); result_ComplexNDArray.insert (tmp(0).complex_array_value (), ra_idx); have_NDArray = false; @@ -565,8 +565,8 @@ (tmp(0).float_array_value (), ra_idx); else { - result_FloatComplexNDArray = - FloatComplexNDArray (result_FloatNDArray); + result_FloatComplexNDArray + = FloatComplexNDArray (result_FloatNDArray); result_FloatComplexNDArray.insert (tmp(0).float_complex_array_value (), ra_idx); have_FloatNDArray = false;
--- a/libinterp/corefcn/cellfun.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/cellfun.cc Sun Jul 21 10:21:01 2019 -0400 @@ -481,12 +481,9 @@ tmp_args(0) = name; if (uniform_output) - retval = - try_cellfun_internal_ops<boolNDArray, NDArray> (tmp_args, - nargin); + retval = try_cellfun_internal_ops<boolNDArray, NDArray> (tmp_args, nargin); else - retval = - try_cellfun_internal_ops<Cell, Cell> (tmp_args, nargin); + retval = try_cellfun_internal_ops<Cell, Cell> (tmp_args, nargin); if (! retval.empty ()) return retval;
--- a/libinterp/corefcn/data.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/data.cc Sun Jul 21 10:21:01 2019 -0400 @@ -1638,8 +1638,8 @@ std::string cname = ov.class_name (); - octave::symbol_table& symtab = - octave::__get_symbol_table__ ("attempt_type_conversion"); + octave::symbol_table& symtab + = octave::__get_symbol_table__ ("attempt_type_conversion"); octave_value fcn = symtab.find_method (dtype, cname); @@ -3398,8 +3398,8 @@ octave_idx_type off = j * nr; for (octave_idx_type i = im_val.cidx (j); i < im_val.cidx (j + 1); i++) - result.data (im_val.ridx (i) + off) += - Complex (0, im_val.data (i)); + result.data (im_val.ridx (i) + off) + += Complex (0, im_val.data (i)); } } retval = octave_value (new octave_sparse_complex_matrix (result)); @@ -3421,8 +3421,8 @@ octave_idx_type off = j * nr; for (octave_idx_type i = re_val.cidx (j); i < re_val.cidx (j + 1); i++) - result.data (re_val.ridx (i) + off) += - re_val.data (i); + result.data (re_val.ridx (i) + off) + += re_val.data (i); } } retval = octave_value (new octave_sparse_complex_matrix (result)); @@ -7199,8 +7199,8 @@ NDT retval (dim_vector (n, 1), zero_val); // Pick minimizer or maximizer. - void (MArray<T>::*op) (const idx_vector&, const MArray<T>&) = - ismin ? (&MArray<T>::idx_min) : (&MArray<T>::idx_max); + void (MArray<T>::*op) (const idx_vector&, const MArray<T>&) + = ismin ? (&MArray<T>::idx_min) : (&MArray<T>::idx_max); octave_idx_type l = idx.length (n); if (vals.numel () == 1) @@ -8022,8 +8022,8 @@ { dim_vector dims; - const Array<octave_idx_type> size = - args(1).octave_idx_type_vector_value (); + const Array<octave_idx_type> size + = args(1).octave_idx_type_vector_value (); dims = dim_vector::alloc (size.numel ()); for (octave_idx_type i = 0; i < size.numel (); i++)
--- a/libinterp/corefcn/dlmread.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/dlmread.cc Sun Jul 21 10:21:01 2019 -0400 @@ -44,8 +44,8 @@ #include "ovl.h" #include "utils.h" -static const octave_idx_type idx_max = - std::numeric_limits<octave_idx_type>::max () - 1; +static const octave_idx_type idx_max + = std::numeric_limits<octave_idx_type>::max () - 1; static const double idx_max_dbl = double (idx_max);
--- a/libinterp/corefcn/error.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/error.cc Sun Jul 21 10:21:01 2019 -0400 @@ -2104,15 +2104,15 @@ if (new_err.contains ("message")) { - const std::string tmp = - new_err.getfield ("message").string_value (); + const std::string tmp + = new_err.getfield ("message").string_value (); new_error_message = tmp; } if (new_err.contains ("identifier")) { - const std::string tmp = - new_err.getfield ("identifier").string_value (); + const std::string tmp + = new_err.getfield ("identifier").string_value (); new_error_id = tmp; } @@ -2122,34 +2122,34 @@ initialize_stack = true; else { - new_err_stack = - new_err.getfield ("stack").scalar_map_value (); + new_err_stack + = new_err.getfield ("stack").scalar_map_value (); if (new_err_stack.contains ("file")) { - const std::string tmp = - new_err_stack.getfield ("file").string_value (); + const std::string tmp + = new_err_stack.getfield ("file").string_value (); new_error_file = tmp; } if (new_err_stack.contains ("name")) { - const std::string tmp = - new_err_stack.getfield ("name").string_value (); + const std::string tmp + = new_err_stack.getfield ("name").string_value (); new_error_name = tmp; } if (new_err_stack.contains ("line")) { - const int tmp = - new_err_stack.getfield ("line").nint_value (); + const int tmp + = new_err_stack.getfield ("line").nint_value (); new_error_line = tmp; } if (new_err_stack.contains ("column")) { - const int tmp = - new_err_stack.getfield ("column").nint_value (); + const int tmp + = new_err_stack.getfield ("column").nint_value (); new_error_column = tmp; } }
--- 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;
--- a/libinterp/corefcn/file-io.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/file-io.cc Sun Jul 21 10:21:01 2019 -0400 @@ -435,8 +435,8 @@ std::ios::openmode md = fopen_mode_to_ios_mode (mode); - octave::mach_info::float_format flt_fmt = - octave::mach_info::string_to_float_format (arch); + octave::mach_info::float_format flt_fmt + = octave::mach_info::string_to_float_format (arch); std::string fname = octave::sys::file_ops::tilde_expand (name);
--- a/libinterp/corefcn/gl-render.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/gl-render.cc Sun Jul 21 10:21:01 2019 -0400 @@ -790,8 +790,8 @@ const graphics_object& go) { graphics_object fig = go.get_ancestor ("figure"); - const figure::properties& figProps = - dynamic_cast<const figure::properties&> (fig.get_properties ()); + const figure::properties& figProps + = dynamic_cast<const figure::properties&> (fig.get_properties ()); // Initialize OpenGL context @@ -808,8 +808,8 @@ const graphics_object& go) { graphics_object fig = go.get_ancestor ("figure"); - const figure::properties& figProps = - dynamic_cast<const figure::properties&> (fig.get_properties ()); + const figure::properties& figProps + = dynamic_cast<const figure::properties&> (fig.get_properties ()); // Initialize OpenGL context @@ -2502,14 +2502,12 @@ NDArray c; const NDArray vn = props.get_vertexnormals ().array_value (); dim_vector vn_dims = vn.dims (); - bool has_vertex_normals = ((vn_dims(0) == zr) && - (vn_dims(1) == zc) && - (vn_dims(2) == 3)); + bool has_vertex_normals = (vn_dims(0) == zr && vn_dims(1) == zc + && vn_dims(2) == 3); const NDArray fn = props.get_facenormals ().array_value (); dim_vector fn_dims = fn.dims (); - bool has_face_normals = ((fn_dims(0) == zr - 1) && - (fn_dims(1) == zc - 1) && - (fn_dims(2) == 3)); + bool has_face_normals = (fn_dims(0) == zr - 1 && fn_dims(1) == zc - 1 + && fn_dims(2) == 3); // FIXME: handle transparency Matrix a; @@ -3288,8 +3286,7 @@ fnn(1) = dir * fn(i,1); fnn(2) = dir * fn(i,2); } - if (((fl_mode == GOURAUD) || (el_mode == GOURAUD)) && - has_vertex_normals) + if ((fl_mode == GOURAUD || el_mode == GOURAUD) && has_vertex_normals) { double dir = 1.0; if (bfl_mode > 0) @@ -3405,8 +3402,8 @@ // Add vertices in reverse order for Matlab compatibility for (int j = i_end; j > i_start; j--) { - vertex_data::vertex_data_rep *vv = - vdata[i+j*fr].get_rep (); + vertex_data::vertex_data_rep *vv + = vdata[i+j*fr].get_rep (); tess.add_vertex (vv->coords.fortran_vec (), vv); } @@ -4074,9 +4071,9 @@ // pts2pix and m_devpixratio should eventually be combined in to a // a single conversion factor so that only one multiplication per // function call is required. - const static double pts2pix = - gh_manager::get_object (0).get ("screenpixelsperinch").double_value () - / 72.0; + const static double pts2pix + = (gh_manager::get_object (0).get ("screenpixelsperinch").double_value () + / 72.0); m_glfcns.glLineWidth (w * pts2pix * m_devpixratio); @@ -4099,9 +4096,9 @@ #if defined (HAVE_OPENGL) // FIXME: See bug #53056 (measure LineWidth in points). - const static double pts2pix = - gh_manager::get_object (0).get ("screenpixelsperinch").double_value () - / 72.0; + const static double pts2pix + = (gh_manager::get_object (0).get ("screenpixelsperinch").double_value () + / 72.0); int factor = math::round (linewidth * pts2pix * m_devpixratio); if (factor < 1) factor = 1; @@ -4443,9 +4440,9 @@ unsigned int ID = m_glfcns.glGenLists (1); // FIXME: See bug #53056 (measure LineWidth in points). - const static double pts2pix = - gh_manager::get_object (0).get ("screenpixelsperinch").double_value () - / 72.0; + const static double pts2pix + = (gh_manager::get_object (0).get ("screenpixelsperinch").double_value () + / 72.0); double sz = size * pts2pix;
--- a/libinterp/corefcn/gl2ps-print.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/gl2ps-print.cc Sun Jul 21 10:21:01 2019 -0400 @@ -922,8 +922,8 @@ // Check that the string is composed of single byte characters const std::string tmpstr = txtobj.get_string (); - const uint8_t *c = - reinterpret_cast<const uint8_t *> (tmpstr.c_str ()); + const uint8_t *c + = reinterpret_cast<const uint8_t *> (tmpstr.c_str ()); for (size_t i = 0; i < tmpstr.size ();) { @@ -1034,10 +1034,10 @@ fontsize = props.get ("__fontsize_points__").double_value (); caseless_str fn = props.get ("fontname").xtolower ().string_value (); - bool isbold = - (props.get ("fontweight").xtolower ().string_value () == "bold"); - bool isitalic = - (props.get ("fontangle").xtolower ().string_value () == "italic"); + bool isbold + =(props.get ("fontweight").xtolower ().string_value () == "bold"); + bool isitalic + = (props.get ("fontangle").xtolower ().string_value () == "italic"); fontname = select_font (fn, isbold, isitalic); } @@ -1132,9 +1132,9 @@ bool do_clip = props.is_clipping (); Matrix vp = get_viewport_scaled (); - ColumnVector vp_lim_min = - xform.untransform (std::numeric_limits <float>::epsilon (), - std::numeric_limits <float>::epsilon ()); + ColumnVector vp_lim_min + = xform.untransform (std::numeric_limits <float>::epsilon (), + std::numeric_limits <float>::epsilon ()); ColumnVector vp_lim_max = xform.untransform (vp(2), vp(3)); if (vp_lim_min(0) > vp_lim_max(0)) @@ -1143,23 +1143,27 @@ if (vp_lim_min(1) > vp_lim_max(1)) std::swap (vp_lim_min(1), vp_lim_max(1)); - float clip_xmin = - (do_clip ? (vp_lim_min(0) > xmin ? vp_lim_min(0) : xmin) : vp_lim_min(0)); - float clip_ymin = - (do_clip ? (vp_lim_min(1) > ymin ? vp_lim_min(1) : ymin) : vp_lim_min(1)); + float clip_xmin + = do_clip ? (vp_lim_min(0) > xmin ? vp_lim_min(0) : xmin) : vp_lim_min(0); + + float clip_ymin + = do_clip ? (vp_lim_min(1) > ymin ? vp_lim_min(1) : ymin) : vp_lim_min(1); - float clip_xmax = - (do_clip ? (vp_lim_max(0) < xmax ? vp_lim_max(0) : xmax) : vp_lim_max(0)); - float clip_ymax = - (do_clip ? (vp_lim_max(1) < ymax ? vp_lim_max(1) : ymax) : vp_lim_max(1)); + float clip_xmax + = do_clip ? (vp_lim_max(0) < xmax ? vp_lim_max(0) : xmax) : vp_lim_max(0); + + float clip_ymax + = do_clip ? (vp_lim_max(1) < ymax ? vp_lim_max(1) : ymax) : vp_lim_max(1); if (im_xmin < clip_xmin) j0 += (clip_xmin - im_xmin)/nor_dx + 1; + if (im_xmax > clip_xmax) j1 -= (im_xmax - clip_xmax)/nor_dx; if (im_ymin < clip_ymin) i0 += (clip_ymin - im_ymin)/nor_dy + 1; + if (im_ymax > clip_ymax) i1 -= (im_ymax - clip_ymax)/nor_dy; @@ -1171,8 +1175,7 @@ float zoom_y; m_glfcns.glGetFloatv (GL_ZOOM_Y, &zoom_y); - m_glfcns.glPixelZoom (m_devpixratio * pix_dx, - - m_devpixratio * pix_dy); + m_glfcns.glPixelZoom (m_devpixratio * pix_dx, - m_devpixratio * pix_dy); m_glfcns.glRasterPos3d (im_xmin + nor_dx*j0, im_ymin + nor_dy*i0, 0); // Expect RGB data
--- a/libinterp/corefcn/graphics.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/graphics.cc Sun Jul 21 10:21:01 2019 -0400 @@ -829,8 +829,8 @@ if (ax.valid_object ()) { - const axes::properties& ax_props = - dynamic_cast<const axes::properties&> (ax.get_properties ()); + const axes::properties& ax_props + = dynamic_cast<const axes::properties&> (ax.get_properties ()); graphics_xform ax_xform = ax_props.get_transform (); bool is_rectangle = (pos.numel () == 4); Matrix ax_bbox = ax_props.get_boundingbox (true), @@ -1774,8 +1774,8 @@ graphics_object go = gh_manager::get_object (0); - root_figure::properties& props = - dynamic_cast<root_figure::properties&> (go.get_properties ()); + root_figure::properties& props + = dynamic_cast<root_figure::properties&> (go.get_properties ()); if (! props.is_showhiddenhandles ()) { @@ -1994,13 +1994,12 @@ graphics_object go; - std::map<caseless_str, graphics_object>::const_iterator it = - dprop_obj_map.find (go_name); + std::map<caseless_str, graphics_object>::const_iterator it + = dprop_obj_map.find (go_name); if (it == dprop_obj_map.end ()) { - base_graphics_object *bgo = - make_graphics_object_from_type (go_name); + base_graphics_object *bgo = make_graphics_object_from_type (go_name); if (bgo) { @@ -3216,8 +3215,8 @@ octave_value base_properties::get_dynamic (const caseless_str& pname) const { - std::map<caseless_str, property, cmp_caseless_str>::const_iterator it = - all_props.find (pname); + std::map<caseless_str, property, cmp_caseless_str>::const_iterator it + = all_props.find (pname); if (it == all_props.end ()) error (R"(get: unknown property "%s")", pname.c_str ()); @@ -3274,8 +3273,8 @@ property base_properties::get_property_dynamic (const caseless_str& pname) { - std::map<caseless_str, property, cmp_caseless_str>::const_iterator it = - all_props.find (pname); + std::map<caseless_str, property, cmp_caseless_str>::const_iterator it + = all_props.find (pname); if (it == all_props.end ()) error (R"(get_property: unknown property "%s")", pname.c_str ()); @@ -3377,8 +3376,8 @@ graphics_object go = gh_manager::get_object (uicontextmenu.get ()); if (go && go.isa ("uicontextmenu")) { - uicontextmenu::properties& props = - reinterpret_cast<uicontextmenu::properties&> (go.get_properties ()); + uicontextmenu::properties& props + = reinterpret_cast<uicontextmenu::properties&> (go.get_properties ()); props.add_dependent_obj (__myhandle__); } } @@ -3439,8 +3438,7 @@ if (! co.isempty () && co.double_value () == __myhandle__) { gh_manager::auto_lock guard; - auto& fig_props = - dynamic_cast<figure::properties&> (fig.get_properties ()); + auto& fig_props = dynamic_cast<figure::properties&> (fig.get_properties ()); fig_props.set_currentobject (Matrix ()); } } @@ -3620,9 +3618,8 @@ { if (valid_object ()) { - property_list::pval_map_type factory_pval = - gh_manager::get_object (0).get_factory_defaults_list () - .find (type ())->second; + property_list::pval_map_type factory_pval + = gh_manager::get_object (0).get_factory_defaults_list ().find (type ())->second; remove_all_listeners (); xreset_default_properties (get_handle (), factory_pval); @@ -6261,8 +6258,8 @@ double wmax = ext(0) + margin; double hmax = ext(1) + margin; double angle = 0.0; - ColumnVector p = - graphics_xform::xform_vector ((xpTickN + xpTick)/2, ypTick, zpTick); + ColumnVector p + = graphics_xform::xform_vector ((xpTickN + xpTick)/2, ypTick, zpTick); bool tick_along_z = nearhoriz || octave::math::isinf (fy); if (tick_along_z) @@ -6363,8 +6360,8 @@ double wmax = ext(0) + margin; double hmax = ext(1) + margin; double angle = 0.0; - ColumnVector p = - graphics_xform::xform_vector (xpTick, (ypTickN + ypTick)/2, zpTick); + ColumnVector p + = graphics_xform::xform_vector (xpTick, (ypTickN + ypTick)/2, zpTick); bool tick_along_z = nearhoriz || octave::math::isinf (fx); if (tick_along_z) @@ -6562,10 +6559,9 @@ // FIXME: bbox should be stored in axes::properties Matrix bbox = get_extent (false); - ColumnVector p = - graphics_xform::xform_vector (bbox(0) + bbox(2)/2, - bbox(1) - 10, - (x_zlim(0) + x_zlim(1))/2); + ColumnVector p + = graphics_xform::xform_vector (bbox(0) + bbox(2)/2, bbox(1) - 10, + (x_zlim(0) + x_zlim(1))/2); if (x2Dtop) { @@ -6805,8 +6801,8 @@ graphics_object go = gh_manager::get_object (get_parent ()); if (go.valid_object ()) - parent_size = - go.get_properties ().get_boundingbox (true).extract_n (0, 2, 1, 2); + parent_size + = go.get_properties ().get_boundingbox (true).extract_n (0, 2, 1, 2); else parent_size = default_figure_position (); } @@ -9022,14 +9018,14 @@ graphics_object kid = *children_list_iter; if (kid.isa ("patch")) { - patch::properties& patch_props = - dynamic_cast<patch::properties&> (kid.get_properties ()); + patch::properties& patch_props + = dynamic_cast<patch::properties&> (kid.get_properties ()); patch_props.update_normals (false); } else { - surface::properties& surface_props = - dynamic_cast<surface::properties&> (kid.get_properties ()); + surface::properties& surface_props + = dynamic_cast<surface::properties&> (kid.get_properties ()); surface_props.update_normals (false); } } @@ -9304,8 +9300,8 @@ base_graphics_object::initialize (go); // trigger normals calculation for the respective children of this axes object - axes::properties& parent_axes_prop = - dynamic_cast<axes::properties&> (go.get_ancestor ("axes").get_properties ()); + axes::properties& parent_axes_prop + = dynamic_cast<axes::properties&> (go.get_ancestor ("axes").get_properties ()); parent_axes_prop.trigger_normals_calc (); } @@ -9787,8 +9783,8 @@ if (updating_patch_data || ! facenormalsmode_is ("auto")) return; - if (force || ((facelighting_is ("flat") || edgelighting_is ("flat")) && - get_do_lighting ())) + if (force || ((facelighting_is ("flat") || edgelighting_is ("flat")) + && get_do_lighting ())) { Matrix f = get_faces ().matrix_value (); @@ -9874,9 +9870,7 @@ RowVector vn1 = *it; // Use sign of dot product to point vectors in a similar // direction before taking the average. - double dir = - (vn0(0)*vn1(0) + vn0(1)*vn1(1) + vn0(2)*vn1(2) < 0) ? -1 - : 1; + double dir = (vn0(0)*vn1(0) + vn0(1)*vn1(1) + vn0(2)*vn1(2) < 0) ? -1 : 1; for (octave_idx_type j = 0; j < 3; j++) vn0(j) += dir * vn1(j); } @@ -9945,8 +9939,8 @@ if (! facenormalsmode_is ("auto")) return; - if (force || ((facelighting_is ("flat") || edgelighting_is ("flat")) && - get_do_lighting ())) + if (force || ((facelighting_is ("flat") || edgelighting_is ("flat")) + && get_do_lighting ())) { Matrix x = get_xdata ().matrix_value (); Matrix y = get_ydata ().matrix_value (); @@ -10057,9 +10051,9 @@ if (! vertexnormalsmode_is ("auto")) return; - if (force || ((facelighting_is ("gouraud") || facelighting_is ("phong") || - edgelighting_is ("gouraud") || edgelighting_is ("phong")) && - get_do_lighting ())) + if (force || ((facelighting_is ("gouraud") || facelighting_is ("phong") + || edgelighting_is ("gouraud") || edgelighting_is ("phong")) + && get_do_lighting ())) { Matrix x = get_xdata ().matrix_value (); Matrix y = get_ydata ().matrix_value (); @@ -10168,14 +10162,14 @@ if (go.isa ("surface")) { - surface::properties& props = - dynamic_cast <surface::properties&> (go.get_properties ()); + surface::properties& props + = dynamic_cast <surface::properties&> (go.get_properties ()); props.update_normals (false, true); } else if (go.isa ("patch")) { - patch::properties& props = - dynamic_cast <patch::properties&> (go.get_properties ()); + patch::properties& props + = dynamic_cast <patch::properties&> (go.get_properties ()); props.update_normals (false, true); } else @@ -10222,9 +10216,8 @@ graphics_object go = gh_manager::get_object (h); if (! from_root && go.isa ("light") && go.get_properties ().is_visible ()) { - axes::properties& ax_props = - dynamic_cast<axes::properties&> - (go.get_ancestor ("axes").get_properties ()); + axes::properties& ax_props + = dynamic_cast<axes::properties&> (go.get_ancestor ("axes").get_properties ()); ax_props.decrease_num_lights (); } base_properties::remove_child (h, from_root); @@ -10237,9 +10230,8 @@ graphics_object go = gh_manager::get_object (h); if (go.isa ("light") && go.get_properties ().is_visible ()) { - axes::properties& ax_props = - dynamic_cast<axes::properties&> - (go.get_ancestor ("axes").get_properties ()); + axes::properties& ax_props + = dynamic_cast<axes::properties&> (go.get_ancestor ("axes").get_properties ()); ax_props.increase_num_lights (); } base_properties::adopt (h); @@ -10597,8 +10589,7 @@ graphics_object go = gh_manager::get_object (get_parent ()); if (go.valid_object ()) - parent_size = - go.get_properties ().get_boundingbox (true).extract_n (0, 2, 1, 2); + parent_size = go.get_properties ().get_boundingbox (true).extract_n (0, 2, 1, 2); else parent_size = default_figure_position (); } @@ -10661,8 +10652,7 @@ { graphics_object go = gh_manager::get_object (get_parent ()); - parent_size = - go.get_properties ().get_boundingbox (true).extract_n (0, 2, 1, 2); + parent_size = go.get_properties ().get_boundingbox (true).extract_n (0, 2, 1, 2); } pos = convert_position (pos, get_units (), "pixels", parent_size); @@ -10863,8 +10853,7 @@ { graphics_object go = gh_manager::get_object (get_parent ()); - parent_size = - go.get_properties ().get_boundingbox (true).extract_n (0, 2, 1, 2); + parent_size = go.get_properties ().get_boundingbox (true).extract_n (0, 2, 1, 2); } pos = convert_position (pos, get_units (), "pixels", parent_size); @@ -11027,8 +11016,7 @@ { graphics_object go = gh_manager::get_object (get_parent ()); - parent_size = - go.get_properties ().get_boundingbox (true).extract_n (0, 2, 1, 2); + parent_size = go.get_properties ().get_boundingbox (true).extract_n (0, 2, 1, 2); } pos = convert_position (pos, get_units (), "pixels", parent_size); @@ -11346,8 +11334,8 @@ // them can't work before the axes object is fully // constructed. - axes::properties& props = - dynamic_cast<axes::properties&> (go.get_properties ()); + axes::properties& props + = dynamic_cast<axes::properties&> (go.get_properties ()); graphics_object tgo; @@ -11634,8 +11622,8 @@ xset_gcbo (const graphics_handle& h) { graphics_object go = gh_manager::get_object (0); - root_figure::properties& props = - dynamic_cast<root_figure::properties&> (go.get_properties ()); + root_figure::properties& props + = dynamic_cast<root_figure::properties&> (go.get_properties ()); props.set_callbackobject (h.as_octave_value ()); } @@ -11882,8 +11870,7 @@ } else { - std::list<graphics_event>::iterator p = - event_queue.begin (); + std::list<graphics_event>::iterator p = event_queue.begin (); while (p != event_queue.end ()) if (p->get_busyaction () == base_graphics_event::CANCEL) @@ -13127,8 +13114,8 @@ if (! go || ! go.isa ("image")) error ("__image_pixel_size__: object is not an image"); - image::properties& ip = - dynamic_cast<image::properties&> (go.get_properties ()); + image::properties& ip + = dynamic_cast<image::properties&> (go.get_properties ()); Matrix dp = Matrix (1, 2); dp(0) = ip.pixel_xsize (); @@ -13795,9 +13782,9 @@ static octave_value wf_listener; if (! wf_listener.is_defined ()) - wf_listener = - octave_value (new octave_builtin (waitfor_listener, - "waitfor_listener")); + wf_listener + = octave_value (new octave_builtin (waitfor_listener, + "waitfor_listener")); max_arg_index++; if (args.length () > 2) @@ -13854,10 +13841,10 @@ static octave_value wf_del_listener; if (! wf_del_listener.is_defined ()) - wf_del_listener = - octave_value (new octave_builtin - (waitfor_del_listener, - "waitfor_del_listener")); + wf_del_listener + = octave_value (new octave_builtin + (waitfor_del_listener, + "waitfor_del_listener")); Cell del_listener (1, 4); @@ -13981,8 +13968,8 @@ graphics_object ax = gh_manager::get_object (handle); - axes::properties& ax_props = - dynamic_cast<axes::properties&> (ax.get_properties ()); + axes::properties& ax_props + = dynamic_cast<axes::properties&> (ax.get_properties ()); if (nargin == 2) {
--- a/libinterp/corefcn/load-save.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/load-save.cc Sun Jul 21 10:21:01 2019 -0400 @@ -826,8 +826,7 @@ os << (mach_info::words_big_endian () ? "Octave-1-B" : "Octave-1-L"); - mach_info::float_format flt_fmt = - mach_info::native_float_format (); + mach_info::float_format flt_fmt = mach_info::native_float_format (); char tmp = static_cast<char> (float_format_to_mopt_digit (flt_fmt));
--- a/libinterp/corefcn/ls-mat4.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/ls-mat4.cc Sun Jul 21 10:21:01 2019 -0400 @@ -396,8 +396,8 @@ mopt += tc.issparse () ? 2 : tc.is_string () ? 1 : 0; - octave::mach_info::float_format flt_fmt = - octave::mach_info::native_float_format ();; + octave::mach_info::float_format flt_fmt + = octave::mach_info::native_float_format ();; mopt += 1000 * float_format_to_mopt_digit (flt_fmt);
--- a/libinterp/corefcn/ls-mat5.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/ls-mat5.cc Sun Jul 21 10:21:01 2019 -0400 @@ -864,8 +864,7 @@ tc = make_fcn_handle (interp, fname); else { - std::string mroot = - m0.contents ("matlabroot").string_value (); + std::string mroot = m0.contents ("matlabroot").string_value (); if ((fpath.length () >= mroot.length ()) && fpath.substr (0, mroot.length ()) == mroot @@ -910,8 +909,7 @@ octave::directory_path p (lp.system_path ()); - str = - octave::sys::env::make_absolute (p.find_first_of (names)); + str = octave::sys::env::make_absolute (p.find_first_of (names)); size_t xpos = str.find_last_of (octave::sys::file_ops::dir_sep_chars ()); @@ -1000,8 +998,7 @@ if (parse_status != 0) error ("load: failed to load anonymous function handle"); - octave_fcn_handle *fh = - anon_fcn_handle.fcn_handle_value (); + octave_fcn_handle *fh = anon_fcn_handle.fcn_handle_value (); if (! fh) error ("load: failed to load anonymous function handle"); @@ -1177,9 +1174,8 @@ { // inline is not an object in Octave but rather an // overload of a function handle. Special case. - tc = - new octave_fcn_inline (m.contents ("expr")(0).string_value (), - m.contents ("args")(0).string_value ()); + tc = new octave_fcn_inline (m.contents ("expr")(0).string_value (), + m.contents ("args")(0).string_value ()); } else {
--- a/libinterp/corefcn/matrix_type.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/matrix_type.cc Sun Jul 21 10:21:01 2019 -0400 @@ -153,8 +153,8 @@ if (mattyp.is_unknown () && autocomp) { - SparseComplexMatrix m = - args(0).sparse_complex_matrix_value (); + SparseComplexMatrix m + = args(0).sparse_complex_matrix_value (); mattyp = MatrixType (m); args(0).matrix_type (mattyp);
--- a/libinterp/corefcn/mex.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/mex.cc Sun Jul 21 10:21:01 2019 -0400 @@ -3679,9 +3679,9 @@ int mexSet (double handle, const char *property, mxArray *val) { - bool ret = - set_property_in_handle (handle, property, mxArray::as_octave_value (val), - "mexSet"); + bool ret + = set_property_in_handle (handle, property, mxArray::as_octave_value (val), + "mexSet"); return (ret ? 0 : 1); }
--- a/libinterp/corefcn/oct-stream.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/oct-stream.cc Sun Jul 21 10:21:01 2019 -0400 @@ -6644,8 +6644,8 @@ octave_idx_type input_elt_size = oct_data_conv::data_type_size (input_type); - ptrdiff_t input_buf_size = - static_cast<ptrdiff_t> (input_buf_elts) * input_elt_size; + ptrdiff_t input_buf_size + = static_cast<ptrdiff_t> (input_buf_elts) * input_elt_size; assert (input_buf_size >= 0);
--- a/libinterp/corefcn/pr-output.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/pr-output.cc Sun Jul 21 10:21:01 2019 -0400 @@ -1313,8 +1313,8 @@ // interrupted before resetting the format flags and fill // character? - octave::mach_info::float_format flt_fmt = - octave::mach_info::native_float_format (); + octave::mach_info::float_format flt_fmt + = octave::mach_info::native_float_format (); os.fill ('0'); os.flags (std::ios::right | std::ios::hex); @@ -1336,8 +1336,8 @@ equiv<T> tmp; tmp.val = val; - octave::mach_info::float_format flt_fmt = - octave::mach_info::native_float_format (); + octave::mach_info::float_format flt_fmt + = octave::mach_info::native_float_format (); if (flt_fmt == octave::mach_info::flt_fmt_ieee_big_endian) {
--- a/libinterp/corefcn/quadcc.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/quadcc.cc Sun Jul 21 10:21:01 2019 -0400 @@ -1469,9 +1469,8 @@ b_new[n + 1] = b_new[n + 1] / Lalpha[n]; b_new[n] = (b_new[n] + xi[nans[i]] * b_new[n + 1]) / Lalpha[n - 1]; for (j = n - 1; j > 0; j--) - b_new[j] = - (b_new[j] + xi[nans[i]] * b_new[j + 1] - - Lgamma[j + 1] * b_new[j + 2]) / Lalpha[j - 1]; + b_new[j] = (b_new[j] + xi[nans[i]] * b_new[j + 1] + - Lgamma[j + 1] * b_new[j + 2]) / Lalpha[j - 1]; for (j = 0; j <= n; j++) b_new[j] = b_new[j + 1]; alpha = c[n] / b_new[n];
--- a/libinterp/corefcn/rand.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/rand.cc Sun Jul 21 10:21:01 2019 -0400 @@ -261,8 +261,8 @@ octave::rand::reset (fcn); else { - ColumnVector s = - ColumnVector (args(idx+1).vector_value (false, true)); + ColumnVector s + = ColumnVector (args(idx+1).vector_value (false, true)); // Backwards compatibility with previous versions of // Octave which mapped Inf to 0.
--- a/libinterp/corefcn/sparse-xpow.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/sparse-xpow.cc Sun Jul 21 10:21:01 2019 -0400 @@ -449,8 +449,8 @@ for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) { octave_quit (); - complex_result.xelem (a.ridx (i), j) = - std::pow (Complex (a.data (i)), Complex (b(a.ridx (i), j))); + complex_result.xelem (a.ridx (i), j) + = std::pow (Complex (a.data (i)), Complex (b(a.ridx (i), j))); } } complex_result.maybe_compress (true); @@ -597,8 +597,8 @@ for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) { octave_quit (); - result (a.ridx (i), j) = - std::pow (a.data (i), static_cast<int> (b)); + result (a.ridx (i), j) + = std::pow (a.data (i), static_cast<int> (b)); } } else
--- a/libinterp/corefcn/syscalls.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/syscalls.cc Sun Jul 21 10:21:01 2019 -0400 @@ -61,12 +61,12 @@ static octave_scalar_map mk_stat_map (const octave::sys::base_file_stat& fs) { - static bool have_rdev = - octave::sys::base_file_stat::have_struct_stat_st_rdev (); - static bool have_blksize = - octave::sys::base_file_stat::have_struct_stat_st_blksize (); - static bool have_blocks = - octave::sys::base_file_stat::have_struct_stat_st_blocks (); + static bool have_rdev + = octave::sys::base_file_stat::have_struct_stat_st_rdev (); + static bool have_blksize + = octave::sys::base_file_stat::have_struct_stat_st_blksize (); + static bool have_blocks + = octave::sys::base_file_stat::have_struct_stat_st_blocks (); static double nan = octave::numeric_limits<double>::NaN ();
--- a/libinterp/corefcn/sysdep.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/sysdep.cc Sun Jul 21 10:21:01 2019 -0400 @@ -189,9 +189,8 @@ if (hShell) { - SETCURRENTAPPID pfnSetCurrentProcessExplicitAppUserModelID = - reinterpret_cast<SETCURRENTAPPID> (GetProcAddress (hShell, - "SetCurrentProcessExplicitAppUserModelID")); + SETCURRENTAPPID pfnSetCurrentProcessExplicitAppUserModelID + = reinterpret_cast<SETCURRENTAPPID> (GetProcAddress (hShell, "SetCurrentProcessExplicitAppUserModelID")); if (pfnSetCurrentProcessExplicitAppUserModelID) pfnSetCurrentProcessExplicitAppUserModelID (L"gnu.octave." VERSION); @@ -345,8 +344,7 @@ { // Check if it ends with the share size_t last_slash = name.find ("\\", next_slash+1); - if (last_slash == -1 || - (len > next_slash+2 && last_slash == len-1)) + if (last_slash == -1 || (len > next_slash+2 && last_slash == len-1)) candidate = true; } } @@ -355,11 +353,11 @@ { // Open a handle to the file. std::wstring wname = sys::u8_to_wstring (name); - HANDLE h = - CreateFileW (wname.c_str (), FILE_READ_ATTRIBUTES, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - nullptr, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, - nullptr); + HANDLE h + = CreateFileW (wname.c_str (), FILE_READ_ATTRIBUTES, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + nullptr, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, + nullptr); if (h != INVALID_HANDLE_VALUE) { CloseHandle (h); @@ -955,9 +953,9 @@ print_usage (); // Input check - std::string rootkey_name = - args(0).xstring_value ("winqueryreg: the first argument must be 'name' " - "or a valid ROOTKEY identifier"); + std::string rootkey_name + = args(0).xstring_value ("winqueryreg: the first argument must be 'name' " + "or a valid ROOTKEY identifier"); std::string subkey_name = ""; std::string value_name = ""; bool get_names = false; @@ -967,18 +965,19 @@ error ("winqueryreg: if the first argument is 'name', " "ROOTKEY and SUBKEY must be given"); get_names = true; - rootkey_name = - args(1).xstring_value ("winqueryreg: ROOTKEY must be a string"); - subkey_name = - args(2).xstring_value ("winqueryreg: SUBKEY must be a string"); + rootkey_name + = args(1).xstring_value ("winqueryreg: ROOTKEY must be a string"); + subkey_name + = args(2).xstring_value ("winqueryreg: SUBKEY must be a string"); } else { - subkey_name = - args(1).xstring_value ("winqueryreg: SUBKEY must be a string"); + subkey_name + = args(1).xstring_value ("winqueryreg: SUBKEY must be a string"); + if (args.length () == 3) - value_name = - args(2).xstring_value ("winqueryreg: VALUENAME must be a string"); + value_name + = args(2).xstring_value ("winqueryreg: VALUENAME must be a string"); } // Get rootkey handle @@ -1245,8 +1244,8 @@ No actual tests are performed. @end deftypefn */) { - octave::mach_info::float_format flt_fmt = - octave::mach_info::native_float_format (); + octave::mach_info::float_format flt_fmt + = octave::mach_info::native_float_format (); return ovl (flt_fmt == octave::mach_info::flt_fmt_ieee_little_endian || flt_fmt == octave::mach_info::flt_fmt_ieee_big_endian); @@ -1262,8 +1261,8 @@ Return the native floating point format as a string. @end deftypefn */) { - octave::mach_info::float_format flt_fmt = - octave::mach_info::native_float_format (); + octave::mach_info::float_format flt_fmt + = octave::mach_info::native_float_format (); return ovl (octave::mach_info::float_format_as_string (flt_fmt)); }
--- a/libinterp/corefcn/utils.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/corefcn/utils.cc Sun Jul 21 10:21:01 2019 -0400 @@ -453,12 +453,10 @@ if (! local_file_ok) { - load_path& lp = - __get_load_path__ ("find_data_file_in_load_path"); + load_path& lp = __get_load_path__ ("find_data_file_in_load_path"); // Not directly found; search load path. - std::string tmp - = sys::env::make_absolute (lp.find_file (fname)); + std::string tmp = sys::env::make_absolute (lp.find_file (fname)); if (! tmp.empty ()) {
--- a/libinterp/dldfcn/__init_fltk__.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/dldfcn/__init_fltk__.cc Sun Jul 21 10:21:01 2019 -0400 @@ -403,9 +403,7 @@ if (kidgo.valid_object () && kidgo.isa ("uimenu")) { uimenu_childs(k) = uimenu_childs(ii); - pos(k++) = - dynamic_cast<uimenu::properties&> - (kidgo.get_properties ()).get_position (); + pos(k++) = dynamic_cast<uimenu::properties&> (kidgo.get_properties ()).get_position (); } } @@ -435,8 +433,8 @@ std::string fltk_label = uimenup.get___fltk_label__ (); if (! fltk_label.empty ()) { - Fl_Menu_Item *item = - const_cast<Fl_Menu_Item *> (m_menubar->find_item (fltk_label.c_str ())); + Fl_Menu_Item *item = const_cast<Fl_Menu_Item *> (m_menubar->find_item (fltk_label.c_str ())); + if (item) { std::string acc = uimenup.get_accelerator (); @@ -916,12 +914,12 @@ if (uimenu_obj.valid_object () && uimenu_obj.isa ("uimenu")) { - uimenu::properties& uimenup = - dynamic_cast<uimenu::properties&> (uimenu_obj.get_properties ()); + uimenu::properties& uimenup + = dynamic_cast<uimenu::properties&> (uimenu_obj.get_properties ()); std::string fltk_label = uimenup.get___fltk_label__ (); graphics_object fig = uimenu_obj.get_ancestor ("figure"); - figure::properties& figp = - dynamic_cast<figure::properties&> (fig.get_properties ()); + figure::properties& figp + = dynamic_cast<figure::properties&> (fig.get_properties ()); switch (id) { @@ -1121,8 +1119,8 @@ && m_ax_obj.get_properties ().get_tag () != "legend" && m_ax_obj.get_properties ().get_tag () != "colorbar") { - axes::properties& ap = - dynamic_cast<axes::properties&>(m_ax_obj.get_properties ()); + axes::properties& ap + = dynamic_cast<axes::properties&>(m_ax_obj.get_properties ()); ap.set (name, value); } else // no axes object clicked so far, take currentaxes @@ -1131,8 +1129,8 @@ if (gh.ok ()) { graphics_object go = gh_manager::get_object (gh); - axes::properties& ap = - dynamic_cast<axes::properties&>(go.get_properties ()); + axes::properties& ap + = dynamic_cast<axes::properties&>(go.get_properties ()); ap.set (name, value); } } @@ -1171,8 +1169,8 @@ { if (ax && ax.isa ("axes")) { - axes::properties& ap = - dynamic_cast<axes::properties&> (ax.get_properties ()); + axes::properties& ap + = dynamic_cast<axes::properties&> (ax.get_properties ()); ColumnVector pp = ap.pixel2coord (px, py); xx = pp(0); yy = pp(1); @@ -1236,8 +1234,8 @@ { if (ax && ax.isa ("axes")) { - axes::properties& ap = - dynamic_cast<axes::properties&> (ax.get_properties ()); + axes::properties& ap + = dynamic_cast<axes::properties&> (ax.get_properties ()); std::stringstream cbuf; cbuf.precision (4); cbuf.width (6); @@ -1256,8 +1254,8 @@ Matrix pos = m_fp.map_from_boundingbox (px, py); m_fp.set_currentpoint (pos); graphics_object robj = gh_manager::get_object (m_fp.get_parent ()); - root_figure::properties& rp = - dynamic_cast<root_figure::properties&> (robj.get_properties ()); + root_figure::properties& rp + = dynamic_cast<root_figure::properties&> (robj.get_properties ()); rp.set_currentfigure (m_fp.get___myhandle__ ().value ()); } } @@ -1266,8 +1264,8 @@ { if (ax.valid_object () && ax.isa ("axes")) { - axes::properties& ap = - dynamic_cast<axes::properties&> (ax.get_properties ()); + axes::properties& ap + = dynamic_cast<axes::properties&> (ax.get_properties ()); Matrix x_zlim = ap.get_transform_zlim (); Matrix pos (2, 3, 0.0); @@ -1649,9 +1647,7 @@ { if (m_ax_obj && m_ax_obj.isa ("axes")) { - axes::properties& ap = - dynamic_cast<axes::properties&> - (m_ax_obj.get_properties ()); + axes::properties& ap = dynamic_cast<axes::properties&> (m_ax_obj.get_properties ()); // Don't pan or rotate legend if (ap.get_tag () != "legend") @@ -1721,14 +1717,14 @@ case FL_MOUSEWHEEL: { - graphics_object ax = - gh_manager::get_object (pixel2axes_or_ca (Fl::event_x (), - Fl::event_y () - - menu_dy ())); + graphics_object ax + = gh_manager::get_object (pixel2axes_or_ca (Fl::event_x (), + Fl::event_y () + - menu_dy ())); if (ax && ax.isa ("axes")) { - axes::properties& ap = - dynamic_cast<axes::properties&> (ax.get_properties ()); + axes::properties& ap + = dynamic_cast<axes::properties&> (ax.get_properties ()); // Control how fast to zoom when using scroll wheel. double wheel_zoom_speed = ap.get_mousewheelzoom (); @@ -2195,8 +2191,8 @@ graphics_object fobj = gh_manager::get_object (h); if (fobj && fobj.isa ("figure")) { - figure::properties& fp = - dynamic_cast<figure::properties&> (fobj.get_properties ()); + figure::properties& fp + = dynamic_cast<figure::properties&> (fobj.get_properties ()); return figprops2idx (fp); } @@ -2260,8 +2256,8 @@ { if (uimenu_obj.valid_object ()) { - uimenu::properties& uimenup = - dynamic_cast<uimenu::properties&> (uimenu_obj.get_properties ()); + uimenu::properties& uimenup + = dynamic_cast<uimenu::properties&> (uimenu_obj.get_properties ()); std::string fltk_label = uimenup.get_label (); graphics_object go = gh_manager::get_object (uimenu_obj.get_parent ()); if (go.isa ("uimenu")) @@ -2286,8 +2282,8 @@ if (! ov.isempty ()) { - const figure::properties& fp = - dynamic_cast<const figure::properties&> (go.get_properties ()); + const figure::properties& fp + = dynamic_cast<const figure::properties&> (go.get_properties ()); switch (id) { @@ -2354,8 +2350,9 @@ graphics_object fobj = gh_manager::get_object (children (n)); if (fobj && fobj.isa ("figure")) { - figure::properties& fp = - dynamic_cast<figure::properties&> (fobj.get_properties ()); + figure::properties& fp + = dynamic_cast<figure::properties&> (fobj.get_properties ()); + if (fp.get___graphics_toolkit__ () == FLTK_GRAPHICS_TOOLKIT_NAME) figure_manager::new_window (fp);
--- a/libinterp/dldfcn/__init_gnuplot__.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/dldfcn/__init_gnuplot__.cc Sun Jul 21 10:21:01 2019 -0400 @@ -73,8 +73,8 @@ { if (go.isa ("figure")) { - const figure::properties& props = - dynamic_cast<const figure::properties&> (go.get_properties ()); + const figure::properties& props + = dynamic_cast<const figure::properties&> (go.get_properties ()); send_quit (props.get___plot_stream__ ()); } @@ -86,8 +86,8 @@ { graphics_object obj (go); - figure::properties& props = - dynamic_cast<figure::properties&> (obj.get_properties ()); + figure::properties& props + = dynamic_cast<figure::properties&> (obj.get_properties ()); switch (id) {
--- a/libinterp/dldfcn/chol.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/dldfcn/chol.cc Sun Jul 21 10:21:01 2019 -0400 @@ -670,8 +670,8 @@ { // complex case FloatComplexMatrix R = argr.float_complex_matrix_value (); - FloatComplexColumnVector u = - argu.float_complex_column_vector_value (); + FloatComplexColumnVector u + = argu.float_complex_column_vector_value (); octave::math::chol<FloatComplexMatrix> fact; fact.set (R); @@ -860,8 +860,8 @@ { // complex case FloatComplexMatrix R = argr.float_complex_matrix_value (); - FloatComplexColumnVector u = - argu.float_complex_column_vector_value (); + FloatComplexColumnVector u + = argu.float_complex_column_vector_value (); octave::math::chol<FloatComplexMatrix> fact; fact.set (R); @@ -888,8 +888,7 @@ { // complex case ComplexMatrix R = argr.complex_matrix_value (); - ComplexColumnVector u = - argu.complex_column_vector_value (); + ComplexColumnVector u = argu.complex_column_vector_value (); octave::math::chol<ComplexMatrix> fact; fact.set (R);
--- a/libinterp/dldfcn/fftw.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/dldfcn/fftw.cc Sun Jul 21 10:21:01 2019 -0400 @@ -206,8 +206,8 @@ } else //planner getter { - octave::fftw_planner::FftwMethod meth = - octave::fftw_planner::method (); + octave::fftw_planner::FftwMethod meth + = octave::fftw_planner::method (); if (meth == octave::fftw_planner::MEASURE) retval = octave_value ("measure");
--- a/libinterp/dldfcn/qr.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/dldfcn/qr.cc Sun Jul 21 10:21:01 2019 -0400 @@ -1243,12 +1243,9 @@ if (argq.is_single_type () || argr.is_single_type () || argx.is_single_type ()) { - FloatComplexMatrix Q = - argq.float_complex_matrix_value (); - FloatComplexMatrix R = - argr.float_complex_matrix_value (); - FloatComplexMatrix x = - argx.float_complex_matrix_value (); + FloatComplexMatrix Q = argq.float_complex_matrix_value (); + FloatComplexMatrix R = argr.float_complex_matrix_value (); + FloatComplexMatrix x = argx.float_complex_matrix_value (); octave::math::qr<FloatComplexMatrix> fact (Q, R); @@ -1435,10 +1432,8 @@ // complex case if (argq.is_single_type () || argr.is_single_type ()) { - FloatComplexMatrix Q = - argq.float_complex_matrix_value (); - FloatComplexMatrix R = - argr.float_complex_matrix_value (); + FloatComplexMatrix Q = argq.float_complex_matrix_value (); + FloatComplexMatrix R = argr.float_complex_matrix_value (); octave::math::qr<FloatComplexMatrix> fact (Q, R);
--- a/libinterp/octave-value/cdef-class.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/octave-value/cdef-class.cc Sun Jul 21 10:21:01 2019 -0400 @@ -981,13 +981,13 @@ std::string mprefix = mname.substr (0, 4); if (mprefix == "get.") - get_methods[mname.substr (4)] = - make_fcn_handle (interp, mtd, - full_class_name + '>' + mname); + get_methods[mname.substr (4)] + = make_fcn_handle (interp, mtd, + full_class_name + '>' + mname); else if (mprefix == "set.") - set_methods[mname.substr (4)] = - make_fcn_handle (interp, mtd, - full_class_name + '>' + mname); + set_methods[mname.substr (4)] + = make_fcn_handle (interp, mtd, + full_class_name + '>' + mname); else { cdef_method meth = cdm.make_method (retval, mname, mtd);
--- a/libinterp/octave-value/cdef-object.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/octave-value/cdef-object.cc Sun Jul 21 10:21:01 2019 -0400 @@ -662,8 +662,7 @@ } else { - octave_value val = - prop.get_value (obj, true, "subsasgn"); + octave_value val = prop.get_value (obj, true, "subsasgn"); std::list<octave_value_list> args (idx);
--- a/libinterp/octave-value/ov-bool-sparse.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/octave-value/ov-bool-sparse.cc Sun Jul 21 10:21:01 2019 -0400 @@ -57,8 +57,8 @@ static octave_base_value * default_numeric_conversion_function (const octave_base_value& a) { - const octave_sparse_bool_matrix& v = - dynamic_cast<const octave_sparse_bool_matrix&> (a); + const octave_sparse_bool_matrix& v + = dynamic_cast<const octave_sparse_bool_matrix&> (a); return new octave_sparse_matrix (SparseMatrix (v.sparse_bool_matrix_value ()));
--- a/libinterp/octave-value/ov-cell.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/octave-value/ov-cell.cc Sun Jul 21 10:21:01 2019 -0400 @@ -128,8 +128,7 @@ octave_base_matrix<Cell>::fast_elem_insert (octave_idx_type n, const octave_value& x) { - const octave_cell *xrep = - dynamic_cast<const octave_cell *> (&x.get_rep ()); + const octave_cell *xrep = dynamic_cast<const octave_cell *> (&x.get_rep ()); bool retval = xrep && xrep->matrix.numel () == 1 && n < matrix.numel (); if (retval)
--- a/libinterp/octave-value/ov-class.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/octave-value/ov-class.cc Sun Jul 21 10:21:01 2019 -0400 @@ -298,8 +298,8 @@ Matrix retval (1, 2, 1.0); - octave::symbol_table& symtab = - octave::__get_symbol_table__ ("octave_class::size"); + octave::symbol_table& symtab + = octave::__get_symbol_table__ ("octave_class::size"); octave_value meth = symtab.find_method ("size", class_name ()); @@ -339,8 +339,8 @@ octave_idx_type retval = -1; const std::string cn = class_name (); - octave::symbol_table& symtab = - octave::__get_symbol_table__ ("octave_class::numel"); + octave::symbol_table& symtab + = octave::__get_symbol_table__ ("octave_class::numel"); octave_value meth = symtab.find_method ("numel", cn); @@ -435,8 +435,8 @@ } else { - octave::symbol_table& symtab = - octave::__get_symbol_table__ ("octave_class::subsref"); + octave::symbol_table& symtab + = octave::__get_symbol_table__ ("octave_class::subsref"); octave_value meth = symtab.find_method ("subsref", class_name ()); @@ -814,8 +814,8 @@ idx_vector octave_class::index_vector (bool require_integers) const { - octave::symbol_table& symtab = - octave::__get_symbol_table__ ("octave_class::index_vector"); + octave::symbol_table& symtab + = octave::__get_symbol_table__ ("octave_class::index_vector"); octave_value meth = symtab.find_method ("subsindex", class_name ()); @@ -863,8 +863,8 @@ { bool retval = false; - octave::symbol_table& symtab = - octave::__get_symbol_table__ ("octave_class::is_true"); + octave::symbol_table& symtab + = octave::__get_symbol_table__ ("octave_class::is_true"); octave_value meth = symtab.find_method ("logical", class_name ());
--- a/libinterp/octave-value/ov-cx-diag.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/octave-value/ov-cx-diag.cc Sun Jul 21 10:21:01 2019 -0400 @@ -43,8 +43,8 @@ static octave_base_value * default_numeric_conversion_function (const octave_base_value& a) { - const octave_complex_diag_matrix& v = - dynamic_cast<const octave_complex_diag_matrix&> (a); + const octave_complex_diag_matrix& v + = dynamic_cast<const octave_complex_diag_matrix&> (a); return new octave_complex_matrix (v.complex_matrix_value ()); } @@ -60,8 +60,8 @@ static octave_base_value * default_numeric_demotion_function (const octave_base_value& a) { - const octave_complex_diag_matrix& v = - dynamic_cast<const octave_complex_diag_matrix&> (a); + const octave_complex_diag_matrix& v + = dynamic_cast<const octave_complex_diag_matrix&> (a); return new octave_float_complex_diag_matrix (v.float_complex_diag_matrix_value ()); @@ -165,8 +165,8 @@ return ::imag (matrix); case umap_sqrt: { - ComplexColumnVector tmp = - matrix.extract_diag ().map<Complex> (std::sqrt); + ComplexColumnVector tmp + = matrix.extract_diag ().map<Complex> (std::sqrt); ComplexDiagMatrix retval (tmp); retval.resize (matrix.rows (), matrix.columns ()); return retval;
--- a/libinterp/octave-value/ov-cx-sparse.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/octave-value/ov-cx-sparse.cc Sun Jul 21 10:21:01 2019 -0400 @@ -177,8 +177,8 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = matrix.cidx (j); i < matrix.cidx (j+1); i++) - retval(matrix.ridx (i) + nr * j) = - static_cast<char> (std::real (matrix.data (i))); + retval(matrix.ridx (i) + nr * j) + = static_cast<char> (std::real (matrix.data (i))); } return retval;
--- a/libinterp/octave-value/ov-fcn-handle.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/octave-value/ov-fcn-handle.cc Sun Jul 21 10:21:01 2019 -0400 @@ -557,8 +557,8 @@ names.push_back (m_name + ".mex"); names.push_back (m_name + ".m"); - octave::load_path& lp = - octave::__get_load_path__ ("octave_fcn_handle::set_fcn"); + octave::load_path& lp + = octave::__get_load_path__ ("octave_fcn_handle::set_fcn"); octave::directory_path p (lp.system_path ()); @@ -919,9 +919,8 @@ bool dummy; std::string doc; - std::string name = - read_binary_data (is, swap, fmt, "", - dummy, t2, doc); + std::string name + = read_binary_data (is, swap, fmt, "", dummy, t2, doc); if (! is) error ("load: failed to load anonymous function handle");
--- a/libinterp/octave-value/ov-flt-cx-diag.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/octave-value/ov-flt-cx-diag.cc Sun Jul 21 10:21:01 2019 -0400 @@ -42,8 +42,8 @@ static octave_base_value * default_numeric_conversion_function (const octave_base_value& a) { - const octave_float_complex_diag_matrix& v = - dynamic_cast<const octave_float_complex_diag_matrix&> (a); + const octave_float_complex_diag_matrix& v + = dynamic_cast<const octave_float_complex_diag_matrix&> (a); return new octave_float_complex_matrix (v.float_complex_matrix_value ()); }
--- a/libinterp/octave-value/ov-flt-re-diag.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/octave-value/ov-flt-re-diag.cc Sun Jul 21 10:21:01 2019 -0400 @@ -41,8 +41,8 @@ static octave_base_value * default_numeric_conversion_function (const octave_base_value& a) { - const octave_float_diag_matrix& v = - dynamic_cast<const octave_float_diag_matrix&> (a); + const octave_float_diag_matrix& v + = dynamic_cast<const octave_float_diag_matrix&> (a); return new octave_float_matrix (v.float_matrix_value ()); }
--- a/libinterp/octave-value/ov-str-mat.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/octave-value/ov-str-mat.cc Sun Jul 21 10:21:01 2019 -0400 @@ -133,9 +133,7 @@ for (k = 0; k < len; k++) idx_vec(k) = idx(k).index_vector (); - retval = - octave_value (charNDArray (matrix.index (idx_vec, resize_ok)), - type); + retval = octave_value (charNDArray (matrix.index (idx_vec, resize_ok)), type); } break; }
--- a/libinterp/octave-value/ov-struct.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/octave-value/ov-struct.cc Sun Jul 21 10:21:01 2019 -0400 @@ -444,8 +444,7 @@ } else { - const octave_map& cmap = - const_cast<const octave_map &> (map); + const octave_map& cmap = const_cast<const octave_map &> (map); // cast to const reference, avoid forced key insertion. if (idxf.all_scalars () || cmap.contents (key).index (idxf, true).numel () == 1)
--- a/libinterp/octave-value/ov.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/octave-value/ov.cc Sun Jul 21 10:21:01 2019 -0400 @@ -2213,12 +2213,12 @@ else { octave_value tv1; - octave_base_value::type_conv_info cf1 = - v1.numeric_conversion_function (); + octave_base_value::type_conv_info cf1 + = v1.numeric_conversion_function (); octave_value tv2; - octave_base_value::type_conv_info cf2 = - v2.numeric_conversion_function (); + octave_base_value::type_conv_info cf2 + = v2.numeric_conversion_function (); // Try biased (one-sided) conversions first. if (cf2.type_id () >= 0
--- a/libinterp/operators/op-b-sbm.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/operators/op-b-sbm.cc Sun Jul 21 10:21:01 2019 -0400 @@ -48,8 +48,8 @@ DEFCATOP (b_sbm, bool, sparse_bool_matrix) { octave_bool& v1 = dynamic_cast<octave_bool&> (a1); - const octave_sparse_bool_matrix& v2 = - dynamic_cast<const octave_sparse_bool_matrix&> (a2); + const octave_sparse_bool_matrix& v2 + = dynamic_cast<const octave_sparse_bool_matrix&> (a2); SparseBoolMatrix tmp (1, 1, v1.bool_value ()); return octave_value (tmp. concat (v2.sparse_bool_matrix_value (), ra_idx)); @@ -66,8 +66,8 @@ DEFCATOP (s_sbm, scalar, sparse_bool_matrix) { octave_scalar& v1 = dynamic_cast<octave_scalar&> (a1); - const octave_sparse_bool_matrix& v2 = - dynamic_cast<const octave_sparse_bool_matrix&> (a2); + const octave_sparse_bool_matrix& v2 + = dynamic_cast<const octave_sparse_bool_matrix&> (a2); SparseMatrix tmp (1, 1, v1.scalar_value ()); return octave_value(tmp. concat (v2.sparse_matrix_value (), ra_idx)); }
--- a/libinterp/operators/op-bm-sbm.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/operators/op-bm-sbm.cc Sun Jul 21 10:21:01 2019 -0400 @@ -50,8 +50,8 @@ DEFCATOP (bm_sbm, bool_matrix, sparse_bool_matrix) { octave_bool_matrix& v1 = dynamic_cast<octave_bool_matrix&> (a1); - const octave_sparse_bool_matrix& v2 = - dynamic_cast<const octave_sparse_bool_matrix&> (a2); + const octave_sparse_bool_matrix& v2 + = dynamic_cast<const octave_sparse_bool_matrix&> (a2); SparseBoolMatrix tmp (v1.bool_matrix_value ()); return octave_value (tmp. concat (v2.sparse_bool_matrix_value (), ra_idx)); @@ -60,8 +60,8 @@ DEFCATOP (m_sbm, matrix, sparse_bool_matrix) { octave_matrix& v1 = dynamic_cast<octave_matrix&> (a1); - const octave_sparse_bool_matrix& v2 = - dynamic_cast<const octave_sparse_bool_matrix&> (a2); + const octave_sparse_bool_matrix& v2 + = dynamic_cast<const octave_sparse_bool_matrix&> (a2); SparseMatrix tmp (v1.matrix_value ()); return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx)); }
--- a/libinterp/operators/op-cdm-cdm.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/operators/op-cdm-cdm.cc Sun Jul 21 10:21:01 2019 -0400 @@ -42,15 +42,15 @@ DEFUNOP (transpose, complex_diag_matrix) { - const octave_complex_diag_matrix& v = - dynamic_cast<const octave_complex_diag_matrix&> (a); + const octave_complex_diag_matrix& v + = dynamic_cast<const octave_complex_diag_matrix&> (a); return octave_value (v.complex_diag_matrix_value ().transpose ()); } DEFUNOP (hermitian, complex_diag_matrix) { - const octave_complex_diag_matrix& v = - dynamic_cast<const octave_complex_diag_matrix&> (a); + const octave_complex_diag_matrix& v + = dynamic_cast<const octave_complex_diag_matrix&> (a); return octave_value (v.complex_diag_matrix_value ().hermitian ()); } @@ -62,10 +62,10 @@ DEFBINOP (div, complex_diag_matrix, complex_diag_matrix) { - const octave_complex_diag_matrix& v1 = - dynamic_cast<const octave_complex_diag_matrix&> (a1); - const octave_complex_diag_matrix& v2 = - dynamic_cast<const octave_complex_diag_matrix&> (a2); + const octave_complex_diag_matrix& v1 + = dynamic_cast<const octave_complex_diag_matrix&> (a1); + const octave_complex_diag_matrix& v2 + = dynamic_cast<const octave_complex_diag_matrix&> (a2); return xdiv (v1.complex_diag_matrix_value (), v2.complex_diag_matrix_value ()); @@ -73,10 +73,10 @@ DEFBINOP (ldiv, complex_diag_matrix, complex_diag_matrix) { - const octave_complex_diag_matrix& v1 = - dynamic_cast<const octave_complex_diag_matrix&> (a1); - const octave_complex_diag_matrix& v2 = - dynamic_cast<const octave_complex_diag_matrix&> (a2); + const octave_complex_diag_matrix& v1 + = dynamic_cast<const octave_complex_diag_matrix&> (a1); + const octave_complex_diag_matrix& v2 + = dynamic_cast<const octave_complex_diag_matrix&> (a2); return xleftdiv (v1.complex_diag_matrix_value (), v2.complex_diag_matrix_value ()); @@ -84,8 +84,8 @@ CONVDECL (complex_diag_matrix_to_complex_matrix) { - const octave_complex_diag_matrix& v = - dynamic_cast<const octave_complex_diag_matrix&> (a); + const octave_complex_diag_matrix& v + = dynamic_cast<const octave_complex_diag_matrix&> (a); return new octave_complex_matrix (v.complex_matrix_value ()); }
--- a/libinterp/operators/op-scm-scm.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/operators/op-scm-scm.cc Sun Jul 21 10:21:01 2019 -0400 @@ -109,9 +109,9 @@ { MatrixType typ = v1.matrix_type (); - SparseComplexMatrix ret = - xleftdiv (v1.sparse_complex_matrix_value (), - v2.sparse_complex_matrix_value (), typ); + SparseComplexMatrix ret + = xleftdiv (v1.sparse_complex_matrix_value (), + v2.sparse_complex_matrix_value (), typ); v1.matrix_type (typ); return ret;
--- a/libinterp/operators/op-sm-scm.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/operators/op-sm-scm.cc Sun Jul 21 10:21:01 2019 -0400 @@ -82,9 +82,9 @@ { MatrixType typ = v1.matrix_type (); - SparseComplexMatrix ret = - xleftdiv (v1.sparse_matrix_value (), - v2.sparse_complex_matrix_value (), typ); + SparseComplexMatrix ret + = xleftdiv (v1.sparse_matrix_value (), + v2.sparse_complex_matrix_value (), typ); v1.matrix_type (typ); return ret;
--- a/libinterp/operators/op-sm-sm.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/operators/op-sm-sm.cc Sun Jul 21 10:21:01 2019 -0400 @@ -58,10 +58,10 @@ static octave_value oct_binop_sub (const octave_base_value& a1, const octave_base_value& a2) { - const octave_sparse_matrix& v1 = - dynamic_cast<const octave_sparse_matrix&> (a1); - const octave_sparse_matrix& v2 = - dynamic_cast<const octave_sparse_matrix&> (a2); + const octave_sparse_matrix& v1 + = dynamic_cast<const octave_sparse_matrix&> (a1); + const octave_sparse_matrix& v2 + = dynamic_cast<const octave_sparse_matrix&> (a2); SparseMatrix m = v1.sparse_matrix_value () - v2.sparse_matrix_value (); return octave_value (m);
--- a/libinterp/parse-tree/jit-typeinfo.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/parse-tree/jit-typeinfo.cc Sun Jul 21 10:21:01 2019 -0400 @@ -1293,8 +1293,8 @@ for (int op = 0; op < octave_value::num_binary_ops; ++op) { - const llvm::Twine &fn_name = - "octave_jit_binary_any_any_" + llvm::Twine (op); + const llvm::Twine& fn_name + = "octave_jit_binary_any_any_" + llvm::Twine (op); fn = create_internal (fn_name, m_any, m_any, m_any); fn.mark_can_error ();
--- a/libinterp/parse-tree/pt-cbinop.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/parse-tree/pt-cbinop.cc Sun Jul 21 10:21:01 2019 -0400 @@ -40,8 +40,8 @@ { if (exp->is_unary_expression ()) { - tree_unary_expression *uexp = - dynamic_cast<tree_unary_expression *> (exp); + tree_unary_expression *uexp + = dynamic_cast<tree_unary_expression *> (exp); octave_value::unary_op op = uexp->op_type (); @@ -66,8 +66,8 @@ { if (exp->is_unary_expression ()) { - tree_unary_expression *uexp = - dynamic_cast<tree_unary_expression *> (exp); + tree_unary_expression *uexp + = dynamic_cast<tree_unary_expression *> (exp); octave_value::unary_op op = uexp->op_type ();
--- a/libinterp/parse-tree/pt-cbinop.h Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/parse-tree/pt-cbinop.h Sun Jul 21 10:21:01 2019 -0400 @@ -74,8 +74,8 @@ tree_compound_binary_expression (const tree_compound_binary_expression&) = delete; - tree_compound_binary_expression& operator = - (const tree_compound_binary_expression&) = delete; + tree_compound_binary_expression& + operator = (const tree_compound_binary_expression&) = delete; }; // a "virtual constructor"
--- a/libinterp/parse-tree/pt-eval.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/libinterp/parse-tree/pt-eval.cc Sun Jul 21 10:21:01 2019 -0400 @@ -1069,8 +1069,8 @@ void tree_evaluator::reset_debug_state (void) { - m_debug_mode = (m_bp_table.have_breakpoints () || - m_dbstep_flag != 0 || in_debug_repl ()); + m_debug_mode + = (m_bp_table.have_breakpoints () || m_dbstep_flag != 0 || in_debug_repl ()); } void
--- a/liboctave/array/CSparse.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/liboctave/array/CSparse.cc Sun Jul 21 10:21:01 2019 -0400 @@ -6393,16 +6393,16 @@ for (octave_idx_type j = 0, iidx = 0; j < b_nc; j++, iidx += b_nr) { - status = - UMFPACK_ZNAME (solve) (UMFPACK_A, - octave::to_suitesparse_intptr (Ap), - octave::to_suitesparse_intptr (Ai), - reinterpret_cast<const double *> (Ax), - nullptr, - reinterpret_cast<double *> (&Xx[iidx]), - nullptr, - reinterpret_cast<const double *> (&Bx[iidx]), - nullptr, Numeric, control, info); + status + = UMFPACK_ZNAME (solve) (UMFPACK_A, + octave::to_suitesparse_intptr (Ap), + octave::to_suitesparse_intptr (Ai), + reinterpret_cast<const double *> (Ax), + nullptr, + reinterpret_cast<double *> (&Xx[iidx]), + nullptr, + reinterpret_cast<const double *> (&Bx[iidx]), + nullptr, Numeric, control, info); if (status < 0) {
--- a/liboctave/array/MatrixType.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/liboctave/array/MatrixType.cc Sun Jul 21 10:21:01 2019 -0400 @@ -345,10 +345,11 @@ else typ = MatrixType::Banded; - octave_idx_type nnz_in_band = - (upper_band + lower_band + 1) * nrows - - (1 + upper_band) * upper_band / 2 - - (1 + lower_band) * lower_band / 2; + octave_idx_type nnz_in_band + = ((upper_band + lower_band + 1) * nrows + - (1 + upper_band) * upper_band / 2 + - (1 + lower_band) * lower_band / 2); + if (nnz_in_band == nnz) dense = true; else
--- a/liboctave/array/dSparse.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/liboctave/array/dSparse.cc Sun Jul 21 10:21:01 2019 -0400 @@ -4250,8 +4250,7 @@ if (Bx[i] != 0. || Bz[i] != 0.) { retval.xridx (ii) = i; - retval.xdata (ii++) = - Complex (Bx[i], Bz[i]); + retval.xdata (ii++) = Complex (Bx[i], Bz[i]); } retval.xcidx (j+1) = ii; @@ -5391,8 +5390,7 @@ if (Bx[i] != 0. || Bz[i] != 0.) { retval.xridx (ii) = i; - retval.xdata (ii++) = - Complex (Bx[i], Bz[i]); + retval.xdata (ii++) = Complex (Bx[i], Bz[i]); } retval.xcidx (j+1) = ii; @@ -5570,8 +5568,7 @@ if (Bx[i] != 0. || Bz[i] != 0.) { retval.xridx (ii) = i; - retval.xdata (ii++) = - Complex (Bx[i], Bz[i]); + retval.xdata (ii++) = Complex (Bx[i], Bz[i]); } retval.xcidx (j+1) = ii; } @@ -5872,8 +5869,8 @@ { #if defined (HAVE_UMFPACK) Matrix Control, Info; - void *Numeric = - factorize (err, rcond, Control, Info, sing_handler, calc_cond); + void *Numeric + = factorize (err, rcond, Control, Info, sing_handler, calc_cond); if (err == 0) {
--- a/liboctave/numeric/eigs-base.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/liboctave/numeric/eigs-base.cc Sun Jul 21 10:21:01 2019 -0400 @@ -109,11 +109,11 @@ break; case -10: - if (fcn_name.compare ("dneupd") == 0 || - fcn_name.compare ("dnaupd") == 0) + if (fcn_name.compare ("dneupd") == 0 + || fcn_name.compare ("dnaupd") == 0) msg = "IPARAM(7) must be 1,2,3,4"; - else if (fcn_name.compare ("zneupd") == 0 || - fcn_name.compare ("znaupd") == 0) + else if (fcn_name.compare ("zneupd") == 0 + || fcn_name.compare ("znaupd") == 0) msg = "IPARAM(7) must be 1,2,3"; else msg = "IPARAM(7) must be 1,2,3,4,5"; @@ -125,12 +125,12 @@ break; case -12: - if (fcn_name.compare ("dnaupd") == 0 || - fcn_name.compare ("znaupd") == 0 || - fcn_name.compare ("dsaupd") == 0) + if (fcn_name.compare ("dnaupd") == 0 + || fcn_name.compare ("znaupd") == 0 + || fcn_name.compare ("dsaupd") == 0) msg = std::string ("IPARAM(1) must be equal to 0 or 1"); - else if (fcn_name.compare ("dneupd") == 0 || - fcn_name.compare ("zneupd") == 0) + else if (fcn_name.compare ("dneupd") == 0 + || fcn_name.compare ("zneupd") == 0) msg = "HOWMNY = 'S' not yet implemented"; else msg = "NEV and WHICH = 'BE' are incompatible"; @@ -138,8 +138,8 @@ break; case -13: - if (fcn_name.compare ("dneupd") == 0 || - fcn_name.compare ("zneupd") == 0) + if (fcn_name.compare ("dneupd") == 0 + || fcn_name.compare ("zneupd") == 0) msg = "HOWMNY must be one of 'A' or 'P' if RVEC = .true."; else if (fcn_name.compare ("dsaupd") == 0) msg = "NEV and WHICH = 'BE' are incompatible"; @@ -177,9 +177,9 @@ case 1: if (fcn_name.compare ("dneupd") == 0) msg = "The Schur form computed by LAPACK routine dlahqr could not be reordered by LAPACK routine dtrsen. Re-enter subroutine DNEUPD with IPARAM(5)=NCV and increase the size of the arrays DR and DI to have dimension at least dimension NCV and allocate at least NCV columns for Z. NOTE: Not necessary if Z and V share the same space. Please notify the authors if this error occurs."; - else if (fcn_name.compare ("dnaupd") == 0 || - fcn_name.compare ("znaupd") == 0 || - fcn_name.compare ("dsaupd") == 0) + else if (fcn_name.compare ("dnaupd") == 0 + || fcn_name.compare ("znaupd") == 0 + || fcn_name.compare ("dsaupd") == 0) msg = "Maximum number of iterations taken. All possible eigenvalues of OP has been found. IPARAM(5) returns the number of wanted converged Ritz values"; else if (fcn_name.compare ("znaupd") == 0) msg = "The Schur form computed by LAPACK routine csheqr could not be reordered by LAPACK routine ztrsen. Re-enter subroutine ZNEUPD with IPARAM(5)=NCV and increase the size of the array D to have dimension at least dimension NCV and allocate at least NCV columns for Z. NOTE: Not necessary if Z and V share the same space. Please notify the authors if this error occurs."; @@ -187,17 +187,17 @@ break; case 2: - if (fcn_name.compare ("dnaupd") == 0 || - fcn_name.compare ("znaupd") == 0 || - fcn_name.compare ("dsaupd") == 0) + if (fcn_name.compare ("dnaupd") == 0 + || fcn_name.compare ("znaupd") == 0 + || fcn_name.compare ("dsaupd") == 0) msg = "No longer an informational error. Deprecated starting with release 2 of ARPACK."; break; case 3: - if (fcn_name.compare ("dnaupd") == 0 || - fcn_name.compare ("znaupd") == 0 || - fcn_name.compare ("dsaupd") == 0) + if (fcn_name.compare ("dnaupd") == 0 + || fcn_name.compare ("znaupd") == 0 + || fcn_name.compare ("dsaupd") == 0) msg = "No shifts could be applied during a cycle of the implicitly restarted Arnoldi iteration. One possibility is to increase the size of NCV relative to NEV."; break; @@ -270,8 +270,8 @@ for (octave_idx_type j = 0; j < b_nc; j++) { for (octave_idx_type i = 0; i < n; i++) - retval.elem (static_cast<octave_idx_type> (qv[i]), j) = - tmp.elem (i,j); + retval.elem (static_cast<octave_idx_type> (qv[i]), j) + = tmp.elem (i,j); } } @@ -439,8 +439,7 @@ for (octave_idx_type i = 0; i < n; i++) { tmp.xcidx (i) = i; - tmp.xridx (i) = - static_cast<octave_idx_type> (permB(i)); + tmp.xridx (i) = static_cast<octave_idx_type> (permB(i)); tmp.xdata (i) = 1; } tmp.xcidx (n) = n; @@ -621,8 +620,7 @@ for (octave_idx_type i = 0; i < n; i++) { tmp.xcidx (i) = i; - tmp.xridx (i) = - static_cast<octave_idx_type> (permB(i)); + tmp.xridx (i) = static_cast<octave_idx_type> (permB(i)); tmp.xdata (i) = 1; } tmp.xcidx (n) = n; @@ -2060,19 +2058,16 @@ if (std::imag (eig_val(i)) == 0) { for (F77_INT j = 0; j < n; j++) - eig_vec(j,i) = - Complex (z[j+off1], 0.); + eig_vec(j,i) = Complex (z[j+off1], 0.); i++; } else { for (F77_INT j = 0; j < n; j++) { - eig_vec(j,i) = - Complex (z[j+off1],z[j+off2]); + eig_vec(j,i) = Complex (z[j+off1],z[j+off2]); if (i < ip(4) - 1) - eig_vec(j,i+1) = - Complex (z[j+off1],-z[j+off2]); + eig_vec(j,i+1) = Complex (z[j+off1],-z[j+off2]); } i+=2; } @@ -2081,16 +2076,16 @@ { for (F77_INT ii = ip(4); ii < k; ii++) for (F77_INT jj = 0; jj < n; jj++) - eig_vec(jj,ii) = - Complex (octave::numeric_limits<double>::NaN (), - octave::numeric_limits<double>::NaN ()); + eig_vec(jj,ii) + = Complex (octave::numeric_limits<double>::NaN (), + octave::numeric_limits<double>::NaN ()); } else { for (F77_INT ii = ip(4); ii < k; ii++) for (F77_INT jj = 0; jj < n; jj++) - eig_vec(jj,ii) = - Complex (octave::numeric_limits<double>::NaN (), 0.); + eig_vec(jj,ii) + = Complex (octave::numeric_limits<double>::NaN (), 0.); } if (note3) eig_vec = utsolve (bt, permB, eig_vec); @@ -2437,19 +2432,16 @@ if (std::imag (eig_val(i)) == 0) { for (F77_INT j = 0; j < n; j++) - eig_vec(j,i) = - Complex (z[j+off1], 0.); + eig_vec(j,i) = Complex (z[j+off1], 0.); i++; } else { for (F77_INT j = 0; j < n; j++) { - eig_vec(j,i) = - Complex (z[j+off1],z[j+off2]); + eig_vec(j,i) = Complex (z[j+off1],z[j+off2]); if (i < ip(4) - 1) - eig_vec(j,i+1) = - Complex (z[j+off1],-z[j+off2]); + eig_vec(j,i+1) = Complex (z[j+off1],-z[j+off2]); } i+=2; } @@ -2458,16 +2450,16 @@ { for (F77_INT ii = ip(4); ii < k; ii++) for (F77_INT jj = 0; jj < n; jj++) - eig_vec(jj,ii) = - Complex (octave::numeric_limits<double>::NaN (), - octave::numeric_limits<double>::NaN ()); + eig_vec(jj,ii) + = Complex (octave::numeric_limits<double>::NaN (), + octave::numeric_limits<double>::NaN ()); } else { for (F77_INT ii = ip(4); ii < k; ii++) for (F77_INT jj = 0; jj < n; jj++) - eig_vec(jj,ii) = - Complex (octave::numeric_limits<double>::NaN (), 0.); + eig_vec(jj,ii) + = Complex (octave::numeric_limits<double>::NaN (), 0.); } } if (k0 < k) @@ -2880,19 +2872,16 @@ if (std::imag (eig_val(i)) == 0) { for (F77_INT j = 0; j < n; j++) - eig_vec(j,i) = - Complex (z[j+off1], 0.); + eig_vec(j,i) = Complex (z[j+off1], 0.); i++; } else { for (F77_INT j = 0; j < n; j++) { - eig_vec(j,i) = - Complex (z[j+off1],z[j+off2]); + eig_vec(j,i) = Complex (z[j+off1],z[j+off2]); if (i < ip(4) - 1) - eig_vec(j,i+1) = - Complex (z[j+off1],-z[j+off2]); + eig_vec(j,i+1) = Complex (z[j+off1],-z[j+off2]); } i+=2; } @@ -2901,16 +2890,16 @@ { for (F77_INT ii = ip(4); ii < k; ii++) for (F77_INT jj = 0; jj < n; jj++) - eig_vec(jj,ii) = - Complex (octave::numeric_limits<double>::NaN (), - octave::numeric_limits<double>::NaN ()); + eig_vec(jj,ii) + = Complex (octave::numeric_limits<double>::NaN (), + octave::numeric_limits<double>::NaN ()); } else { for (F77_INT ii = ip(4); ii < k; ii++) for (F77_INT jj = 0; jj < n; jj++) - eig_vec(jj,ii) = - Complex (octave::numeric_limits<double>::NaN (), 0.); + eig_vec(jj,ii) + = Complex (octave::numeric_limits<double>::NaN (), 0.); } if (note3) eig_vec = utsolve (bt, permB, eig_vec);
--- a/liboctave/numeric/lo-specfun.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/liboctave/numeric/lo-specfun.cc Sun Jul 21 10:21:01 2019 -0400 @@ -2025,13 +2025,13 @@ // gamma functions -1/12, 3/360,-5/1260, 7/1680,-9/1188, // 11*691/360360,-13/156, 15*3617/122400, ? , ? static const T dg_coeff[10] = - { - -0.83333333333333333e-1, 0.83333333333333333e-2, - -0.39682539682539683e-2, 0.41666666666666667e-2, - -0.75757575757575758e-2, 0.21092796092796093e-1, - -0.83333333333333333e-1, 0.4432598039215686, - -0.3053954330270122e+1, 0.125318899521531e+2 - }; + { + -0.83333333333333333e-1, 0.83333333333333333e-2, + -0.39682539682539683e-2, 0.41666666666666667e-2, + -0.75757575757575758e-2, 0.21092796092796093e-1, + -0.83333333333333333e-1, 0.4432598039215686, + -0.3053954330270122e+1, 0.125318899521531e+2 + }; T overz2 = T (1.0) / (zc * zc); T overz2k = overz2; @@ -2047,8 +2047,8 @@ T xpsi (T z) { - static const double euler_mascheroni = - 0.577215664901532860606512090082402431042; + static const double euler_mascheroni + = 0.577215664901532860606512090082402431042; const bool is_int = (std::floor (z) == z);
--- a/liboctave/numeric/oct-fftw.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/liboctave/numeric/oct-fftw.cc Sun Jul 21 10:21:01 2019 -0400 @@ -241,21 +241,21 @@ (((reinterpret_cast<ptrdiff_t> (itmp) + 15) & ~ 0xF) + ((reinterpret_cast<ptrdiff_t> (in)) & 0xF)); - *cur_plan_p = - fftw_plan_many_dft (rank, tmp, howmany, - reinterpret_cast<fftw_complex *> (itmp), - nullptr, stride, dist, - reinterpret_cast<fftw_complex *> (out), - nullptr, stride, dist, dir, plan_flags); + *cur_plan_p + = fftw_plan_many_dft (rank, tmp, howmany, + reinterpret_cast<fftw_complex *> (itmp), + nullptr, stride, dist, + reinterpret_cast<fftw_complex *> (out), + nullptr, stride, dist, dir, plan_flags); } else { - *cur_plan_p = - fftw_plan_many_dft (rank, tmp, howmany, - reinterpret_cast<fftw_complex *> (const_cast<Complex *> (in)), - nullptr, stride, dist, - reinterpret_cast<fftw_complex *> (out), - nullptr, stride, dist, dir, plan_flags); + *cur_plan_p + = fftw_plan_many_dft (rank, tmp, howmany, + reinterpret_cast<fftw_complex *> (const_cast<Complex *> (in)), + nullptr, stride, dist, + reinterpret_cast<fftw_complex *> (out), + nullptr, stride, dist, dir, plan_flags); } if (*cur_plan_p == nullptr) @@ -360,20 +360,20 @@ (((reinterpret_cast<ptrdiff_t> (itmp) + 15) & ~ 0xF) + ((reinterpret_cast<ptrdiff_t> (in)) & 0xF)); - *cur_plan_p = - fftw_plan_many_dft_r2c (rank, tmp, howmany, itmp, - nullptr, stride, dist, - reinterpret_cast<fftw_complex *> (out), - nullptr, stride, dist, plan_flags); + *cur_plan_p + = fftw_plan_many_dft_r2c (rank, tmp, howmany, itmp, + nullptr, stride, dist, + reinterpret_cast<fftw_complex *> (out), + nullptr, stride, dist, plan_flags); } else { - *cur_plan_p = - fftw_plan_many_dft_r2c (rank, tmp, howmany, - (const_cast<double *> (in)), - nullptr, stride, dist, - reinterpret_cast<fftw_complex *> (out), - nullptr, stride, dist, plan_flags); + *cur_plan_p + = fftw_plan_many_dft_r2c (rank, tmp, howmany, + (const_cast<double *> (in)), + nullptr, stride, dist, + reinterpret_cast<fftw_complex *> (out), + nullptr, stride, dist, plan_flags); } if (*cur_plan_p == nullptr) @@ -593,21 +593,21 @@ (((reinterpret_cast<ptrdiff_t> (itmp) + 15) & ~ 0xF) + ((reinterpret_cast<ptrdiff_t> (in)) & 0xF)); - *cur_plan_p = - fftwf_plan_many_dft (rank, tmp, howmany, - reinterpret_cast<fftwf_complex *> (itmp), - nullptr, stride, dist, - reinterpret_cast<fftwf_complex *> (out), - nullptr, stride, dist, dir, plan_flags); + *cur_plan_p + = fftwf_plan_many_dft (rank, tmp, howmany, + reinterpret_cast<fftwf_complex *> (itmp), + nullptr, stride, dist, + reinterpret_cast<fftwf_complex *> (out), + nullptr, stride, dist, dir, plan_flags); } else { - *cur_plan_p = - fftwf_plan_many_dft (rank, tmp, howmany, - reinterpret_cast<fftwf_complex *> (const_cast<FloatComplex *> (in)), - nullptr, stride, dist, - reinterpret_cast<fftwf_complex *> (out), - nullptr, stride, dist, dir, plan_flags); + *cur_plan_p + = fftwf_plan_many_dft (rank, tmp, howmany, + reinterpret_cast<fftwf_complex *> (const_cast<FloatComplex *> (in)), + nullptr, stride, dist, + reinterpret_cast<fftwf_complex *> (out), + nullptr, stride, dist, dir, plan_flags); } if (*cur_plan_p == nullptr) @@ -712,20 +712,20 @@ (((reinterpret_cast<ptrdiff_t> (itmp) + 15) & ~ 0xF) + ((reinterpret_cast<ptrdiff_t> (in)) & 0xF)); - *cur_plan_p = - fftwf_plan_many_dft_r2c (rank, tmp, howmany, itmp, - nullptr, stride, dist, - reinterpret_cast<fftwf_complex *> (out), - nullptr, stride, dist, plan_flags); + *cur_plan_p + = fftwf_plan_many_dft_r2c (rank, tmp, howmany, itmp, + nullptr, stride, dist, + reinterpret_cast<fftwf_complex *> (out), + nullptr, stride, dist, plan_flags); } else { - *cur_plan_p = - fftwf_plan_many_dft_r2c (rank, tmp, howmany, - (const_cast<float *> (in)), - nullptr, stride, dist, - reinterpret_cast<fftwf_complex *> (out), - nullptr, stride, dist, plan_flags); + *cur_plan_p + = fftwf_plan_many_dft_r2c (rank, tmp, howmany, + (const_cast<float *> (in)), + nullptr, stride, dist, + reinterpret_cast<fftwf_complex *> (out), + nullptr, stride, dist, plan_flags); } if (*cur_plan_p == nullptr)
--- a/liboctave/util/cmd-edit.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/liboctave/util/cmd-edit.cc Sun Jul 21 10:21:01 2019 -0400 @@ -908,9 +908,8 @@ char ** gnu_readline::command_completer (const char *text, int, int) { - char **matches = - ::octave_rl_completion_matches (text, - gnu_readline::command_generator); + char **matches + = ::octave_rl_completion_matches (text, gnu_readline::command_generator); return matches; }
--- a/liboctave/util/lo-regexp.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/liboctave/util/lo-regexp.cc Sun Jul 21 10:21:01 2019 -0400 @@ -100,8 +100,8 @@ (*current_liboctave_error_handler) ("regexp: syntax error in pattern"); - std::string tmp_name = - pattern.substr (new_pos+3, tmp_pos-new_pos-3); + std::string tmp_name + = pattern.substr (new_pos+3, tmp_pos-new_pos-3); bool found = false; @@ -384,9 +384,9 @@ if (nidx[j] == i) { size_t len = ovector[2*i+1] - ovector[2*i]; - named_tokens(named_idx(j)) = - std::string (*(listptr+i-pos_offset), - len); + named_tokens(named_idx(j)) + = std::string (*(listptr+i-pos_offset), + len); break; } }
--- a/liboctave/util/oct-inttypes.h Fri Jul 19 14:15:04 2019 -0400 +++ b/liboctave/util/oct-inttypes.h Sun Jul 21 10:21:01 2019 -0400 @@ -138,12 +138,13 @@ static const bool t1sig = std::numeric_limits<T1>::is_signed; static const bool t2sig = std::numeric_limits<T2>::is_signed; - static const bool psig = - (pint || (sizeof (T2) > sizeof (T1) && t2sig) || t1sig); + static const bool psig + = (pint || (sizeof (T2) > sizeof (T1) && t2sig) || t1sig); - static const int psize = - (pint ? sizeof (int) : (sizeof (T2) > sizeof (T1) - ? sizeof (T2) : sizeof (T1))); + static const int psize + = (pint + ? sizeof (int) + : (sizeof (T2) > sizeof (T1) ? sizeof (T2) : sizeof (T1))); public: typedef typename query_integer_type<psize, psig>::type type; @@ -371,12 +372,12 @@ static const int t_size = sizeof (T); static const int s_size = sizeof (S); - static const bool omit_chk_min = - (! s_is_signed || (t_is_signed && t_size >= s_size)); + static const bool omit_chk_min + = (! s_is_signed || (t_is_signed && t_size >= s_size)); - static const bool omit_chk_max = - (t_size > s_size || (t_size == s_size - && (! t_is_signed || s_is_signed))); + static const bool omit_chk_max + = (t_size > s_size + || (t_size == s_size && (! t_is_signed || s_is_signed))); // If the check can be omitted, substitute constant false // relation.
--- a/liboctave/util/url-transfer.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/liboctave/util/url-transfer.cc Sun Jul 21 10:21:01 2019 -0400 @@ -864,10 +864,11 @@ // Needed by mediaWiki API. curl_version_info_data * data = curl_version_info(CURLVERSION_NOW); const char *lib_ver = data->version; - std::string user_agent = - "GNU Octave/" + std::string (OCTAVE_VERSION) + - " (https://www.gnu.org/software/octave/ ; help@octave.org) libcurl/" - + std::string (lib_ver); + std::string user_agent + ("GNU Octave/" + + std::string (OCTAVE_VERSION) + + " (https://www.gnu.org/software/octave/ ; help@octave.org) libcurl/" + + std::string (lib_ver)); SETOPT (CURLOPT_USERAGENT, user_agent.c_str ());
--- a/src/mkoctfile.in.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/src/mkoctfile.in.cc Sun Jul 21 10:21:01 2019 -0400 @@ -898,10 +898,10 @@ if ((pos = line.rfind (".o:")) != std::string::npos) { size_t spos = line.rfind ('/', pos); - std::string ofile = - (spos == std::string::npos - ? line.substr (0, pos+2) - : line.substr (spos+1, pos-spos+1)); + std::string ofile + = (spos == std::string::npos + ? line.substr (0, pos+2) + : line.substr (spos+1, pos-spos+1)); fo << "pic/" << ofile << ' ' << ofile << ' ' << dfile << line.substr (pos) << std::endl; } @@ -932,10 +932,10 @@ if ((pos = line.rfind (".o:")) != std::string::npos) { size_t spos = line.rfind ('/', pos); - std::string ofile = - (spos == std::string::npos - ? line.substr (0, pos+2) - : line.substr (spos+1, pos-spos+1)); + std::string ofile + = (spos == std::string::npos + ? line.substr (0, pos+2) + : line.substr (spos+1, pos-spos+1)); fo << "pic/" << ofile << ' ' << ofile << ' ' << dfile << line.substr (pos+2) << std::endl; }
--- a/src/octave-svgconvert.cc Fri Jul 19 14:15:04 2019 -0400 +++ b/src/octave-svgconvert.cc Sun Jul 21 10:21:01 2019 -0400 @@ -251,10 +251,10 @@ static inline bool eq (QPointF p1, QPointF p2) { - return ((qAbs (p1.x () - p2.x ()) <= - 0.00001 * qMin (qAbs (p1.x ()), qAbs (p2.x ()))) - && (qAbs (p1.y () - p2.y ()) <= - 0.00001 * qMin (qAbs (p1.y ()), qAbs (p2.y ())))); + return ((qAbs (p1.x () - p2.x ()) + <= 0.00001 * qMin (qAbs (p1.x ()), qAbs (p2.x ()))) + && (qAbs (p1.y () - p2.y ()) + <= 0.00001 * qMin (qAbs (p1.y ()), qAbs (p2.y ())))); } static @@ -533,9 +533,8 @@ // Images are represented as a base64 stream of png formated data QString href_att = elt.attribute ("xlink:href"); QString prefix ("data:image/png;base64,"); - QByteArray data = - QByteArray::fromBase64(href_att.mid (prefix.length ()) - .toLatin1 ()); + QByteArray data + = QByteArray::fromBase64 (href_att.mid (prefix.length ()).toLatin1 ()); QImage img; if (img.loadFromData (data, "PNG")) { @@ -707,8 +706,7 @@ int main(int argc, char *argv[]) { const char *doc = "See \"octave-svgconvert -h\""; - const char *help = -"Usage:\n\ + const char *help = "Usage:\n\ octave-svgconvert infile fmt dpi font reconstruct outfile\n\n\ Convert svg file to pdf, or svg. All arguments are mandatory:\n\ * infile: input svg file or \"-\" to indicate that the input svg file should be \