# HG changeset patch
# User Rik <rik@octave.org>
# Date 1578705912 28800
# Node ID b018f553fd852ece2db702acf66903ca7b5aa8dc
# Parent  0fa21907e54c6595fcfcc7b3216eba70294b691e
maint: Use Octave coding conventions in libinterp/

* __ftp__.cc, __ichol__.cc, call-stack.cc, error.h, event-manager.cc,
file-io.cc, gl-render.cc, graphics.cc, help.cc, input.cc, interpreter.cc,
load-path.cc, load-save.cc, ls-hdf5.cc, ls-hdf5.h, mex.cc, oct-hist.cc,
oct-stream.cc, sighandlers.h, stack-frame.cc, stack-frame.h, strfns.cc,
syminfo.cc, sysdep.cc, text-engine.h, url-handle-manager.h, urlwrite.cc,
xpow.cc, __init_fltk__.cc, __ode15__.cc, ccolamd.cc, colamd.cc, cdef-class.cc,
cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-object.cc,
cdef-package.h, cdef-property.cc, ov-class.cc, ov-classdef.cc, ov-cx-sparse.cc,
ov-fcn-handle.cc, ov-fcn-inline.cc, ov-fcn.h, ov-java.cc, ov-typeinfo.h,
bp-table.cc, jit-ir.h, jit-typeinfo.h, pt-classdef.h, pt-eval.cc, pt-eval.h,
pt-idx.cc: Use Octave coding conventions in libinterp.

diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/__ftp__.cc
--- a/libinterp/corefcn/__ftp__.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/__ftp__.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -76,12 +76,12 @@
   std::string host = args(0).xstring_value ("__ftp__: HOST must be a string");
 
   std::string user = (nargin > 1)
-    ? args(1).xstring_value ("__ftp__: USER must be a string")
-    : "anonymous";
+                     ? args(1).xstring_value ("__ftp__: USER must be a string")
+                     : "anonymous";
 
   std::string passwd = (nargin > 2)
-    ? args(2).xstring_value ("__ftp__: PASSWD must be a string")
-    : "";
+                       ? args(2).xstring_value ("__ftp__: PASSWD must be a string")
+                       : "";
 
   octave::url_handle_manager& uhm = interp.get_url_handle_manager ();
 
@@ -471,7 +471,7 @@
 
   if (nargin == 3 && ! args(2).isempty ())
     target = args(2).xstring_value ("__ftp_mget__: TARGET must be a string")
-                        + octave::sys::file_ops::dir_sep_str ();
+             + octave::sys::file_ops::dir_sep_str ();
 
   octave::url_handle_manager& uhm = interp.get_url_handle_manager ();
 
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/__ichol__.cc
--- a/libinterp/corefcn/__ichol__.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/__ichol__.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -246,7 +246,7 @@
   max_len += (0.1 * max_len) > n ? 0.1 * max_len : n;
   Array <octave_idx_type> cidx_out_l (dim_vector (n + 1, 1));
   octave_idx_type *cidx_l = cidx_out_l.fortran_vec ();
-  Array <octave_idx_type> ridx_out_l (dim_vector (max_len ,1));
+  Array <octave_idx_type> ridx_out_l (dim_vector (max_len, 1));
   octave_idx_type *ridx_l = ridx_out_l.fortran_vec ();
   Array <T> data_out_l (dim_vector (max_len, 1));
   T* data_l = data_out_l.fortran_vec ();
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/call-stack.cc
--- a/libinterp/corefcn/call-stack.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/call-stack.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -1070,9 +1070,8 @@
                     bool is_global = true;
                     bool is_persistent = false;
 
-                    symbol_info
-                      syminf (nm, value, is_formal,
-                              is_global, is_persistent);
+                    symbol_info syminf (nm, value, is_formal, is_global,
+                                        is_persistent);
 
                     symbol_stats.append (syminf);
                   }
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/error.h
--- a/libinterp/corefcn/error.h	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/error.h	Fri Jan 10 17:25:12 2020 -0800
@@ -95,7 +95,8 @@
       return val;
     }
 
-    octave_value discard_warning_messages (const octave_value_list& args, int nargout);
+    octave_value discard_warning_messages (const octave_value_list& args,
+                                           int nargout);
 
     void set_discard_warning_messages (bool flag) { m_discard_warning_messages = flag; }
 
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/event-manager.cc
--- a/libinterp/corefcn/event-manager.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/event-manager.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -313,7 +313,7 @@
 
   std::pair<std::list<int>, int> result
     = evmgr.list_dialog (list_lst, mode, width, height, initial_lst,
-                        name, prompt_lst, ok_string, cancel_string);
+                         name, prompt_lst, ok_string, cancel_string);
 
   std::list<int> items_lst = result.first;
   nel = items_lst.size ();
@@ -398,7 +398,7 @@
 }
 
 DEFMETHOD (__event_manager_show_preferences__, interp, , ,
-       doc: /* -*- texinfo -*-
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} __event_manager_show_preferences__ ()
 Undocumented internal function.
 @end deftypefn */)
@@ -409,7 +409,7 @@
 }
 
 DEFMETHOD (__event_manager_apply_preferences__, interp, , ,
-       doc: /* -*- texinfo -*-
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} __event_manager_apply_preferences__ ()
 Undocumented internal function.
 @end deftypefn */)
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/file-io.cc
--- a/libinterp/corefcn/file-io.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/file-io.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -395,18 +395,18 @@
   std::transform (encoding.begin (), encoding.end (), encoding.begin (),
                   ::tolower);
   if (encoding.compare ("utf-8"))
-  {
-    // check if encoding is valid
-    void *codec = octave_iconv_open_wrapper (encoding.c_str (), "utf-8");
-    if (codec == reinterpret_cast<void *> (-1))
-      {
-        if (errno == EINVAL)
-          error ("fopen: conversion from codepage '%s' not supported",
-                 encoding.c_str ());
-      }
-    else
-      octave_iconv_close_wrapper (codec);
-  }
+    {
+      // check if encoding is valid
+      void *codec = octave_iconv_open_wrapper (encoding.c_str (), "utf-8");
+      if (codec == reinterpret_cast<void *> (-1))
+        {
+          if (errno == EINVAL)
+            error ("fopen: conversion from codepage '%s' not supported",
+                   encoding.c_str ());
+        }
+      else
+        octave_iconv_close_wrapper (codec);
+    }
 
   std::string mode = mode_arg;
   bool use_zlib = false;
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/gl-render.cc
--- a/libinterp/corefcn/gl-render.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/gl-render.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -2631,7 +2631,7 @@
             if ((fl_mode > 0) && do_lighting)
               m_glfcns.glEnable (GL_LIGHTING);
             m_glfcns.glShadeModel ((fc_mode == INTERP || fl_mode == GOURAUD)
-                          ? GL_SMOOTH : GL_FLAT);
+                                   ? GL_SMOOTH : GL_FLAT);
             set_polygon_offset (true, 1.0);
             if (fc_mode == TEXTURE)
               m_glfcns.glEnable (GL_TEXTURE_2D);
@@ -2837,7 +2837,7 @@
             if ((el_mode > 0) && do_lighting)
               m_glfcns.glEnable (GL_LIGHTING);
             m_glfcns.glShadeModel ((ec_mode == INTERP || el_mode == GOURAUD)
-                          ? GL_SMOOTH : GL_FLAT);
+                                   ? GL_SMOOTH : GL_FLAT);
 
             set_linestyle (props.get_linestyle (), false,
                            props.get_linewidth ());
@@ -3528,7 +3528,7 @@
                     bool flag = false;
 
                     m_glfcns.glShadeModel ((ec_mode == INTERP || el_mode == GOURAUD)
-                                  ? GL_SMOOTH : GL_FLAT);
+                                           ? GL_SMOOTH : GL_FLAT);
 
                     // Add vertices in reverse order for Matlab compatibility
                     for (int j = count_f(i)-1; j >= 0; j--)
@@ -4142,11 +4142,12 @@
           pattern = 0x1111;
       }
     else if (s == "--")
+      {
         if (factor > 1)
           pattern = 0x0F0F;
         else
           pattern = 0x01FF;
-
+      }
     else if (s == "-.")
       {
         if (factor > 1)
@@ -4685,7 +4686,7 @@
         m_glfcns.glRasterPos3d (x, y, z);
         m_glfcns.glBitmap(0, 0, 0, 0, bbox(0), bbox(1), nullptr);
         m_glfcns.glDrawPixels (bbox(2), bbox(3),
-                      GL_RGBA, GL_UNSIGNED_BYTE, pixels.data ());
+                               GL_RGBA, GL_UNSIGNED_BYTE, pixels.data ());
         m_glfcns.glDisable (GL_ALPHA_TEST);
 
         if (! blend)
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/graphics.cc
--- a/libinterp/corefcn/graphics.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/graphics.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -2918,7 +2918,7 @@
 
   if (old_gh.value () < 0)
     m_handle_free_list.insert (std::ceil (old_gh.value ())
-                             - make_handle_fraction ());
+                               - make_handle_fraction ());
 
   for (auto& hfig : m_figure_list)
     {
@@ -5708,8 +5708,7 @@
 
   if (! is_beingdeleted ())
     {
-      hp = gh_mgr.make_graphics_handle ("text", __myhandle__,
-                                             false, false);
+      hp = gh_mgr.make_graphics_handle ("text", __myhandle__, false, false);
 
       xset (hp.handle_value (), "handlevisibility", "off");
 
@@ -13091,7 +13090,7 @@
   try
     {
       h = gh_mgr.make_graphics_handle (go_name, parent,
-                                          integer_figure_handle, false, false);
+                                       integer_figure_handle, false, false);
     }
   catch (octave::execution_exception& e)
     {
@@ -13178,7 +13177,7 @@
             }
 
           h = gh_mgr.make_graphics_handle ("figure", 0, int_fig_handle,
-                                              false, false);
+                                           false, false);
 
           if (! int_fig_handle)
             {
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/help.cc
--- a/libinterp/corefcn/help.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/help.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -76,54 +76,54 @@
 namespace octave
 {
   const static char * const operators[] =
-    {
-     "!",
-     "~",
-     "!=",
-     "~=",
-     R"(")",
-     "#",
-     "%",
-     "#{",
-     "%{",
-     "#}",
-     "%}",
-     "...",
-     "&",
-     "&&",
-     "'",
-     "(",
-     ")",
-     "*",
-     "**",
-     "^",
-     "+",
-     "++",
-     ",",
-     "-",
-     "--",
-     ".'",
-     ".*",
-     ".**",
-     ".^",
-     "./",
-     "/",
-     R"(.\)",
-     R"(\)",
-     ":",
-     ";",
-     "<",
-     "<=",
-     "=",
-     "==",
-     ">",
-     ">=",
-     "[",
-     "]",
-     "|",
-     "||",
-     nullptr
-    };
+  {
+    "!",
+    "~",
+    "!=",
+    "~=",
+    R"(")",
+    "#",
+    "%",
+    "#{",
+    "%{",
+    "#}",
+    "%}",
+    "...",
+    "&",
+    "&&",
+    "'",
+    "(",
+    ")",
+    "*",
+    "**",
+    "^",
+    "+",
+    "++",
+    ",",
+    "-",
+    "--",
+    ".'",
+    ".*",
+    ".**",
+    ".^",
+    "./",
+    "/",
+    R"(.\)",
+    R"(\)",
+    ":",
+    ";",
+    "<",
+    "<=",
+    "=",
+    "==",
+    ">",
+    ">=",
+    "[",
+    "]",
+    "|",
+    "||",
+    nullptr
+  };
 
   const static string_vector operator_names (operators);
 
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/input.cc
--- a/libinterp/corefcn/input.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/input.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -364,8 +364,9 @@
                 else
                   retval = name;
 
-                char prev_char = command_editor::get_prev_char
-                  (text.length ());
+                char prev_char =
+                  command_editor::get_prev_char (text.length ());
+
                 if (matches == 1 && looks_like_struct (retval, prev_char))
                   {
                     // Don't append anything, since we don't know
@@ -402,38 +403,38 @@
   {
   }
 
-    void input_system::initialize (bool line_editing)
-    {
-      // Force default line editor if we don't want readline editing.
-      if (! line_editing)
-        {
-          command_editor::force_default_editor ();
-          return;
-        }
+  void input_system::initialize (bool line_editing)
+  {
+    // Force default line editor if we don't want readline editing.
+    if (! line_editing)
+      {
+        command_editor::force_default_editor ();
+        return;
+      }
 
-      // If we are using readline, this allows conditional parsing of the
-      // .inputrc file.
+    // If we are using readline, this allows conditional parsing of the
+    // .inputrc file.
 
-      command_editor::set_name ("Octave");
+    command_editor::set_name ("Octave");
 
-      // FIXME: this needs to include a comma too, but that
-      // causes trouble for the new struct element completion code.
+    // FIXME: this needs to include a comma too, but that
+    // causes trouble for the new struct element completion code.
 
-      static const char *s = "\t\n !\"\'*+-/:;<=>(){}[\\]^`~";
+    static const char *s = "\t\n !\"\'*+-/:;<=>(){}[\\]^`~";
 
-      command_editor::set_basic_word_break_characters (s);
+    command_editor::set_basic_word_break_characters (s);
 
-      command_editor::set_completer_word_break_characters (s);
+    command_editor::set_completer_word_break_characters (s);
 
-      command_editor::set_basic_quote_characters (R"(")");
+    command_editor::set_basic_quote_characters (R"(")");
 
-      command_editor::set_filename_quote_characters (" \t\n\\\"'@<>=;|&()#$`?*[!:{");
+    command_editor::set_filename_quote_characters (" \t\n\\\"'@<>=;|&()#$`?*[!:{");
 
-      command_editor::set_completer_quote_characters (R"('")");
+    command_editor::set_completer_quote_characters (R"('")");
 
-      command_editor::set_completion_function (generate_completion);
+    command_editor::set_completion_function (generate_completion);
 
-      command_editor::set_quoting_function (quoting_filename);
+    command_editor::set_quoting_function (quoting_filename);
   }
 
   octave_value
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/interpreter.cc
--- a/libinterp/corefcn/interpreter.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/interpreter.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -393,7 +393,7 @@
       {
         octave_set_xerbla_handler_ptr octave_set_xerbla_handler
           = reinterpret_cast<octave_set_xerbla_handler_ptr>
-          (libs.search ("octave_set_xerbla_handler"));
+              (libs.search ("octave_set_xerbla_handler"));
 
         if (octave_set_xerbla_handler)
           octave_set_xerbla_handler (xerbla_abort);
@@ -902,7 +902,7 @@
         std::string user_config_dir = sys::env::get_user_config_directory ();
 
         std::string cfg_dir = user_config_dir + sys::file_ops::dir_sep_str ()
-                            + "octave";
+                              + "octave";
 
         std::string cfg_rc = sys::env::make_absolute ("octaverc", cfg_dir);
 
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/load-path.cc
--- a/libinterp/corefcn/load-path.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/load-path.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -172,7 +172,8 @@
         if (! dir_name.empty ())
           {
             std::string pfname = dir_name + sys::file_ops::dir_sep_str ()
-              + "private" + sys::file_ops::dir_sep_str () + fname;
+                                 + "private" + sys::file_ops::dir_sep_str ()
+                                 + fname;
 
             sys::file_stat fs (pfname);
 
@@ -447,8 +448,8 @@
 
         // get base name, allowing "@class/method.m" (bug #41514)
         std::string base_file = (file.length () > dir.length ())
-          ? file.substr (dir.length () + 1)
-          : sys::env::base_pathname (file);
+                                ? file.substr (dir.length () + 1)
+                                : sys::env::base_pathname (file);
 
         std::string lp_file = find_file (base_file);
 
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/load-save.cc
--- a/libinterp/corefcn/load-save.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/load-save.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -846,7 +846,7 @@
 
           // ISO 8601 format date
           const char *matlab_format = "MATLAB 5.0 MAT-file, written by Octave "
-            OCTAVE_VERSION ", %Y-%m-%d %T UTC";
+                                      OCTAVE_VERSION ", %Y-%m-%d %T UTC";
           std::string comment_string = now.strftime (matlab_format);
 
           size_t len = std::min (comment_string.length (), static_cast<size_t> (124));
@@ -1071,7 +1071,7 @@
   {
     return
       (std::string ("# Created by Octave " OCTAVE_VERSION
-                   ", %a %b %d %H:%M:%S %Y %Z <")
+                    ", %a %b %d %H:%M:%S %Y %Z <")
        + sys::env::get_user_name ()
        + '@'
        + sys::env::get_host_name ()
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/ls-hdf5.cc
--- a/libinterp/corefcn/ls-hdf5.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/ls-hdf5.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -724,14 +724,14 @@
             }
           else if (hdf5_types_compatible (type_id, range_type))
             {
-               // If it's not a complex, check if it's a range
-               d->tc = octave_value_typeinfo::lookup_type ("range");
+              // If it's not a complex, check if it's a range
+              d->tc = octave_value_typeinfo::lookup_type ("range");
             }
           else // Otherwise, just ignore it with a warning.
             {
-               warning ("load: can't read '%s' (unknown datatype)", name);
-               retval = 0;  // unknown datatype; skip
-               return retval;
+              warning ("load: can't read '%s' (unknown datatype)", name);
+              retval = 0;  // unknown datatype; skip
+              return retval;
             }
 
           H5Tclose (range_type);
@@ -1192,7 +1192,7 @@
     goto error_cleanup;
 
   dims[0] = 0;
-  space_id = H5Screate_simple (0 , dims, nullptr);
+  space_id = H5Screate_simple (0, dims, nullptr);
   if (space_id < 0)
     goto error_cleanup;
 #if defined (HAVE_HDF5_18)
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/ls-hdf5.h
--- a/libinterp/corefcn/ls-hdf5.h	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/ls-hdf5.h	Fri Jan 10 17:25:12 2020 -0800
@@ -97,8 +97,7 @@
 
 // Callback data structure for passing data to hdf5_read_next_data, below.
 
-struct
-hdf5_callback_data
+struct hdf5_callback_data
 {
   hdf5_callback_data (void)
     : name (), global (false), tc (), doc () { }
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/mex.cc
--- a/libinterp/corefcn/mex.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/mex.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -672,7 +672,9 @@
 protected:
 
   mxArray_matlab (mxClassID id_arg = mxUNKNOWN_CLASS)
-    : mxArray_base (), class_name (nullptr), id (id_arg), ndims (0), dims (nullptr) { }
+    : mxArray_base (), class_name (nullptr), id (id_arg), ndims (0),
+      dims (nullptr)
+  { }
 
   mxArray_matlab (mxClassID id_arg, mwSize ndims_arg, const mwSize *dims_arg)
     : mxArray_base (), class_name (nullptr), id (id_arg),
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/oct-hist.cc
--- a/libinterp/corefcn/oct-hist.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/oct-hist.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -545,7 +545,7 @@
 
     if (file.empty ())
       file = sys::file_ops::concat (sys::env::get_home_directory (),
-                                            ".octave_hist");
+                                    ".octave_hist");
 
     return file;
   }
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/oct-stream.cc
--- a/libinterp/corefcn/oct-stream.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/oct-stream.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -536,8 +536,8 @@
               }
             goto fini;
 
-            // We accept E and G for compatibility with undocumented
-            // Matlab behavior.
+          // We accept E and G for compatibility with undocumented
+          // Matlab behavior.
           case 'e': case 'f': case 'g':
           case 'E': case 'G':
             if (modifier == 'h')
@@ -3504,7 +3504,7 @@
         // delimiters at the start of the conversion, or can those be skipped?
         if (elem->type != textscan_format_elt::literal_conversion
             // && elem->type != '[' && elem->type != '^' && elem->type != 'c'
-            )
+           )
           skip_delim (is);
 
         if (is.eof ())
@@ -3535,9 +3535,9 @@
       is.setstate (std::ios::eofbit);
 
     return no_conversions
-      + (is.eof () ? 2 : 0)
-      + (conversion_failed ? 4 : 0)
-      + (nothing_worked ? 8 : 0);
+           + (is.eof () ? 2 : 0)
+           + (conversion_failed ? 4 : 0)
+           + (nothing_worked ? 8 : 0);
 
   }
 
@@ -3590,7 +3590,7 @@
                           delim_list(j) = do_string_escapes (delim_list(j)
                                                              .string_value ());
                         octave_idx_type len = delim_list(j).string_value ()
-                          .length ();
+                                              .length ();
                         delim_len = std::max (static_cast<int> (len), delim_len);
                       }
                   }
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/sighandlers.h
--- a/libinterp/corefcn/sighandlers.h	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/sighandlers.h	Fri Jan 10 17:25:12 2020 -0800
@@ -45,8 +45,7 @@
   // This type must match the typedef in signal-wrappers.h.
   typedef void sig_handler (int);
 
-  struct
-  interrupt_handler
+  struct interrupt_handler
   {
     sig_handler *int_handler;
     sig_handler *brk_handler;
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/stack-frame.cc
--- a/libinterp/corefcn/stack-frame.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/stack-frame.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -1421,7 +1421,7 @@
        << " (" << m_fcn->type_name () << ")" << std::endl;
 
     display_scope (os, get_scope ());
- }
+  }
 
   void user_fcn_stack_frame::accept (stack_frame_walker& sfw)
   {
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/stack-frame.h
--- a/libinterp/corefcn/stack-frame.h	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/stack-frame.h	Fri Jan 10 17:25:12 2020 -0800
@@ -664,8 +664,7 @@
       return m_static_link->varref (sym);
     }
 
-    void mark_scope (const symbol_record& sym,
-                                               scope_flags flag)
+    void mark_scope (const symbol_record& sym, scope_flags flag)
     {
       // Look in closest stack frame that contains values (either the
       // top scope, or a user-defined function or script).
@@ -731,7 +730,8 @@
 
     void set_script_offsets (void);
 
-    void set_script_offsets_internal (const std::map<std::string, symbol_record>& symbols);
+    void set_script_offsets_internal (const std::map<std::string,
+                                                     symbol_record>& symbols);
 
     void resize_and_update_script_offsets (const symbol_record& sym);
 
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/strfns.cc
--- a/libinterp/corefcn/strfns.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/strfns.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -964,7 +964,7 @@
                "libiconv and then re-compiling Octave could fix this.");
       else
         error ("unicode2native: converting from UTF-8 to codepage '%s': %s",
-                codepage, std::strerror (errno));
+               codepage, std::strerror (errno));
     }
 
   frame.add_fcn (::free, static_cast<void *> (native_bytes));
@@ -1014,13 +1014,13 @@
   Array<octave_idx_type> p (dim_vector (str.ndims (), 1));
   charNDArray str_p;
   if (str.ndims () > 1)
-  {
-    for (octave_idx_type i=0; i < str.ndims (); i++)
-      p(i) = i;
-    p(0) = 1;
-    p(1) = 0;
-    str_p = str.permute (p);
-  }
+    {
+      for (octave_idx_type i=0; i < str.ndims (); i++)
+        p(i) = i;
+      p(0) = 1;
+      p(1) = 0;
+      str_p = str.permute (p);
+    }
 
   const uint8_t *src = reinterpret_cast<const uint8_t *> (str_p.data ());
   octave_idx_type srclen = str.numel ();
@@ -1029,14 +1029,14 @@
 
   octave_idx_type u8_char_num = 1;
   for (octave_idx_type i = 0; i < srclen; u8_char_num++)
-  {
-    int mblen = octave_u8_strmblen_wrapper (src + i);
-    if (mblen < 1)
-      mblen = 1;
-    for (octave_idx_type j = 0; j < mblen; j++)
-      idx (i+j) = u8_char_num;
-    i += mblen;
-  }
+    {
+      int mblen = octave_u8_strmblen_wrapper (src + i);
+      if (mblen < 1)
+        mblen = 1;
+      for (octave_idx_type j = 0; j < mblen; j++)
+        idx (i+j) = u8_char_num;
+      i += mblen;
+    }
 
   return ovl(str.ndims () > 1 ? idx.permute (p, true) : idx);
 }
@@ -1104,7 +1104,7 @@
 @end deftypefn */)
 {
   if (args.length () != 0)
-  print_usage ();
+    print_usage ();
 
   static octave_value_list retval = ovl ("\n");
 
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/syminfo.cc
--- a/libinterp/corefcn/syminfo.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/syminfo.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -76,10 +76,10 @@
                 if (param.command == 's')
                   {
                     int front = param.first_parameter_length
-                      - dims_str.find ('x');
+                                - dims_str.find ('x');
                     int back = param.parameter_length
-                      - dims_str.length ()
-                      - front;
+                               - dims_str.length ()
+                               - front;
                     front = (front > 0) ? front : 0;
                     back = (back > 0) ? back : 0;
 
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/sysdep.cc
--- a/libinterp/corefcn/sysdep.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/sysdep.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -350,7 +350,7 @@
     size_t len = name.length ();
     bool candidate = false;
     if (len > 1 && isalpha(name[0]) && name[1]==':'
-         && (len == 2 || (len == 3 && name[2] == '\\')))
+        && (len == 2 || (len == 3 && name[2] == '\\')))
       candidate = true;
     if (len > 4 && name[0] == '\\' && name[1] == '\\')
       {
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/text-engine.h
--- a/libinterp/corefcn/text-engine.h	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/text-engine.h	Fri Jan 10 17:25:12 2020 -0800
@@ -126,14 +126,14 @@
     }
 
     ~text_element_list (void)
-      {
-        while (! empty ())
-          {
-            auto it = begin ();
-            delete (*it);
-            erase (it);
-          }
-      }
+    {
+      while (! empty ())
+        {
+          auto it = begin ();
+          delete (*it);
+          erase (it);
+        }
+    }
 
     void accept (text_processor& p);
   };
@@ -148,10 +148,10 @@
 
     text_element_subscript (char c)
       : text_element ()
-      { elem = new text_element_string (std::string (1, c)); }
+    { elem = new text_element_string (std::string (1, c)); }
 
     ~text_element_subscript (void)
-      { delete elem; }
+    { delete elem; }
 
     void accept (text_processor& p);
 
@@ -174,10 +174,10 @@
 
     text_element_superscript (char c)
       : text_element ()
-      { elem = new text_element_string (std::string (1, c)); }
+    { elem = new text_element_string (std::string (1, c)); }
 
     ~text_element_superscript (void)
-      { delete elem; }
+    { delete elem; }
 
     void accept (text_processor& p);
 
@@ -200,7 +200,7 @@
 
     text_element_combined (text_element *e1, text_element *e2)
       : text_element_list(e1)
-      { push_back (e2); }
+    { push_back (e2); }
 
     void accept (text_processor& p);
   };
@@ -283,29 +283,29 @@
   public:
     text_element_color (double r, double g, double b)
       : text_element (), rgb (1, 3, 0.0)
-      {
-        rgb(0) = r;
-        rgb(1) = g;
-        rgb(2) = b;
-      }
+    {
+      rgb(0) = r;
+      rgb(1) = g;
+      rgb(2) = b;
+    }
 
     text_element_color (const std::string& cname)
       : text_element (), rgb (1, 3, 0.0)
-      {
+    {
 #define ASSIGN_COLOR(r,g,b) { rgb(0) = r; rgb(1) = g; rgb(2) = b; }
-        if (cname == "red") ASSIGN_COLOR(1, 0, 0)
-        else if (cname == "green") ASSIGN_COLOR(0, 1, 0)
-        else if (cname == "yellow") ASSIGN_COLOR(1, 1, 0)
-        else if (cname == "magenta") ASSIGN_COLOR(1, 0, 1)
-        else if (cname == "blue") ASSIGN_COLOR(0, 0, 1)
-        else if (cname == "black") ASSIGN_COLOR(0, 0, 0)
-        else if (cname == "white") ASSIGN_COLOR(1, 1, 1)
-        else if (cname == "gray") ASSIGN_COLOR(.5, .5, .5)
-        else if (cname == "darkGreen") ASSIGN_COLOR(0, .5, 0)
-        else if (cname == "orange") ASSIGN_COLOR(1, .65, 0)
-        else if (cname == "lightBlue") ASSIGN_COLOR(0.68, .85, .9)
+      if (cname == "red") ASSIGN_COLOR(1, 0, 0)
+      else if (cname == "green") ASSIGN_COLOR(0, 1, 0)
+      else if (cname == "yellow") ASSIGN_COLOR(1, 1, 0)
+      else if (cname == "magenta") ASSIGN_COLOR(1, 0, 1)
+      else if (cname == "blue") ASSIGN_COLOR(0, 0, 1)
+      else if (cname == "black") ASSIGN_COLOR(0, 0, 0)
+      else if (cname == "white") ASSIGN_COLOR(1, 1, 1)
+      else if (cname == "gray") ASSIGN_COLOR(.5, .5, .5)
+      else if (cname == "darkGreen") ASSIGN_COLOR(0, .5, 0)
+      else if (cname == "orange") ASSIGN_COLOR(1, .65, 0)
+      else if (cname == "lightBlue") ASSIGN_COLOR(0.68, .85, .9)
 #undef ASSIGN_COLOR
-      }
+    }
 
     ~text_element_color (void) = default;
 
@@ -419,10 +419,10 @@
   public:
     text_parser_tex (void)
       : text_parser (), scanner (nullptr), buffer_state (nullptr), result (nullptr)
-      { }
+    { }
 
     ~text_parser_tex (void)
-      { destroy_lexer (); }
+    { destroy_lexer (); }
 
     text_element * parse (const std::string& s);
 
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/url-handle-manager.h
--- a/libinterp/corefcn/url-handle-manager.h	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/url-handle-manager.h	Fri Jan 10 17:25:12 2020 -0800
@@ -50,7 +50,7 @@
 
     url_handle_manager (void)
       : handle_map (), handle_free_list (),
-      next_handle (-1.0 - (rand () + 1.0) / (RAND_MAX + 2.0)) { }
+        next_handle (-1.0 - (rand () + 1.0) / (RAND_MAX + 2.0)) { }
 
     url_handle_manager (const url_handle_manager&) = delete;
 
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/urlwrite.cc
--- a/libinterp/corefcn/urlwrite.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/urlwrite.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -310,49 +310,49 @@
   string_vector keys = object.map_keys ();
 
   for (int i = 0; i < keys.numel (); i++)
-  {
-    if (keys(i) == "Timeout")
     {
-      float timeout = object.get (keys(i)).float_value ();
-      options.Timeout = static_cast<long>(timeout * 1000);
-    }
+      if (keys(i) == "Timeout")
+        {
+          float timeout = object.get (keys(i)).float_value ();
+          options.Timeout = static_cast<long>(timeout * 1000);
+        }
 
-    if (keys(i) == "HeaderFields")
-    {
-      options.HeaderFields = object.get (keys(i)).cellstr_value ();
-    }
+      if (keys(i) == "HeaderFields")
+        {
+          options.HeaderFields = object.get (keys(i)).cellstr_value ();
+        }
 
-    // FIXME: 'delete' and 'display', auto-generated, probably by cdef_object
-    // class?  Remaining fields have already been adjusted elsewhere in the
-    // m-script.  Set 'value' as the Value of the Key wherever it's a string.
-    if (keys(i) != "Timeout" && keys(i) != "HeaderFields"
-        && keys(i) != "delete" && keys(i) != "display")
-    {
-      std::string value = object.get (keys(i)).string_value ();
+      // FIXME: 'delete' and 'display', auto-generated, probably by cdef_object
+      // class?  Remaining fields have already been adjusted elsewhere in the
+      // m-script.  Set 'value' as the Value of the Key wherever it's a string.
+      if (keys(i) != "Timeout" && keys(i) != "HeaderFields"
+          && keys(i) != "delete" && keys(i) != "display")
+        {
+          std::string value = object.get (keys(i)).string_value ();
 
-      if (keys(i) == "UserAgent")
-        options.UserAgent = value;
+          if (keys(i) == "UserAgent")
+            options.UserAgent = value;
 
-      if (keys(i) == "Username")
-        options.Username = value;
+          if (keys(i) == "Username")
+            options.Username = value;
 
-      if (keys(i) == "Password")
-        options.Password = value;
+          if (keys(i) == "Password")
+            options.Password = value;
 
-      if (keys(i) == "ContentReader")
-        // Unimplemented.  Only for MATLAB compatibility.
-        options.ContentReader = "";
+          if (keys(i) == "ContentReader")
+            // Unimplemented.  Only for MATLAB compatibility.
+            options.ContentReader = "";
 
-      if (keys(i) == "RequestMethod")
-        method = value;
+          if (keys(i) == "RequestMethod")
+            method = value;
 
-      if (keys(i) == "ArrayFormat")
-        options.ArrayFormat = value;
+          if (keys(i) == "ArrayFormat")
+            options.ArrayFormat = value;
 
-      if (keys(i) == "CertificateFilename")
-        options.CertificateFilename = "";
+          if (keys(i) == "CertificateFilename")
+            options.CertificateFilename = "";
+        }
     }
-  }
 
   url_xfer.set_weboptions (options);
 
diff -r 0fa21907e54c -r b018f553fd85 libinterp/corefcn/xpow.cc
--- a/libinterp/corefcn/xpow.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/xpow.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -67,7 +67,7 @@
 err_nonsquare_matrix (void)
 {
   error ("for x^y, only square matrix arguments are permitted and one " \
-    "argument must be scalar.  Use .^ for elementwise power.");
+         "argument must be scalar.  Use .^ for elementwise power.");
 }
 
 template <typename T>
diff -r 0fa21907e54c -r b018f553fd85 libinterp/dldfcn/__init_fltk__.cc
--- a/libinterp/dldfcn/__init_fltk__.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/dldfcn/__init_fltk__.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -1761,8 +1761,8 @@
               {
                 graphics_object ax
                   = gh_mgr.get_object (pixel2axes_or_ca (Fl::event_x (),
-                                                            Fl::event_y ()
-                                                            - menu_dy ()));
+                                                         Fl::event_y ()
+                                                         - menu_dy ()));
                 if (ax && ax.isa ("axes"))
                   {
                     axes::properties& ap
diff -r 0fa21907e54c -r b018f553fd85 libinterp/dldfcn/__ode15__.cc
--- a/libinterp/dldfcn/__ode15__.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/dldfcn/__ode15__.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -775,7 +775,7 @@
             // Linear interpolation
             ie(0) = index(0);
             te(0) = tsol - val (index(0)) * (tsol - told)
-              / (val (index(0)) - oldval (index(0)));
+                    / (val (index(0)) - oldval (index(0)));
 
             ColumnVector ytemp
               = y - ((tsol - te(0)) * (y - yold) / (tsol - told));
@@ -800,7 +800,7 @@
                 // Linear interpolation
                 ie(temp+i) = index(i);
                 te(temp+i) = tsol - val(index(i)) * (tsol - told)
-                  / (val(index(i)) - oldval(index(i)));
+                             / (val(index(i)) - oldval(index(i)));
 
                 ColumnVector ytemp
                   = y - (tsol - te (temp + i)) * (y - yold) / (tsol - told);
diff -r 0fa21907e54c -r b018f553fd85 libinterp/dldfcn/ccolamd.cc
--- a/libinterp/dldfcn/ccolamd.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/dldfcn/ccolamd.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -147,7 +147,8 @@
   int spumoni = 0;
 
   // Get knobs
-  static_assert (CCOLAMD_KNOBS <= 40, "ccolamd: # of CCOLAMD_KNOBS exceeded.  Please report this to bugs.octave.org");
+  static_assert (CCOLAMD_KNOBS <= 40,
+                 "ccolamd: # of CCOLAMD_KNOBS exceeded.  Please report this to bugs.octave.org");
   double knob_storage[CCOLAMD_KNOBS];
   double *knobs = &knob_storage[0];
   CCOLAMD_NAME (_set_defaults) (knobs);
@@ -262,7 +263,8 @@
   for (octave_idx_type i = 0; i < nnz; i++)
     A[i] = ridx[i];
 
-  static_assert (CCOLAMD_STATS <= 40, "ccolamd: # of CCOLAMD_STATS exceeded.  Please report this to bugs.octave.org");
+  static_assert (CCOLAMD_STATS <= 40,
+                 "ccolamd: # of CCOLAMD_STATS exceeded.  Please report this to bugs.octave.org");
   octave::suitesparse_integer stats_storage[CCOLAMD_STATS];
   octave::suitesparse_integer *stats = &stats_storage[0];
 
@@ -412,7 +414,8 @@
   int spumoni = 0;
 
   // Get knobs
-  static_assert (CCOLAMD_KNOBS <= 40, "csymamd: # of CCOLAMD_KNOBS exceeded.  Please report this to bugs.octave.org");
+  static_assert (CCOLAMD_KNOBS <= 40,
+                 "csymamd: # of CCOLAMD_KNOBS exceeded.  Please report this to bugs.octave.org");
   double knob_storage[CCOLAMD_KNOBS];
   double *knobs = &knob_storage[0];
   CCOLAMD_NAME (_set_defaults) (knobs);
@@ -501,7 +504,8 @@
 
   // Allocate workspace for symamd
   OCTAVE_LOCAL_BUFFER (octave::suitesparse_integer, perm, n_col+1);
-  static_assert (CCOLAMD_STATS <= 40, "csymamd: # of CCOLAMD_STATS exceeded.  Please report this to bugs.octave.org");
+  static_assert (CCOLAMD_STATS <= 40,
+                 "csymamd: # of CCOLAMD_STATS exceeded.  Please report this to bugs.octave.org");
   octave::suitesparse_integer stats_storage[CCOLAMD_STATS];
   octave::suitesparse_integer *stats = &stats_storage[0];
 
diff -r 0fa21907e54c -r b018f553fd85 libinterp/dldfcn/colamd.cc
--- a/libinterp/dldfcn/colamd.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/dldfcn/colamd.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -281,7 +281,8 @@
   int spumoni = 0;
 
   // Get knobs
-  static_assert (COLAMD_KNOBS <= 40, "colamd: # of COLAMD_KNOBS exceeded.  Please report this to bugs.octave.org");
+  static_assert (COLAMD_KNOBS <= 40,
+                 "colamd: # of COLAMD_KNOBS exceeded.  Please report this to bugs.octave.org");
   double knob_storage[COLAMD_KNOBS];
   double *knobs = &knob_storage[0];
   COLAMD_NAME (_set_defaults) (knobs);
@@ -383,7 +384,8 @@
     A[i] = ridx[i];
 
   // Order the columns (destroys A)
-  static_assert (COLAMD_STATS <= 40, "colamd: # of COLAMD_STATS exceeded.  Please report this to bugs.octave.org");
+  static_assert (COLAMD_STATS <= 40,
+                 "colamd: # of COLAMD_STATS exceeded.  Please report this to bugs.octave.org");
   octave::suitesparse_integer stats_storage[COLAMD_STATS];
   octave::suitesparse_integer *stats = &stats_storage[0];
   if (! COLAMD_NAME () (n_row, n_col, Alen, A, p, knobs, stats))
@@ -523,7 +525,8 @@
   int spumoni = 0;
 
   // Get knobs
-  static_assert (COLAMD_KNOBS <= 40, "symamd: # of COLAMD_KNOBS exceeded.  Please report this to bugs.octave.org");
+  static_assert (COLAMD_KNOBS <= 40,
+                 "symamd: # of COLAMD_KNOBS exceeded.  Please report this to bugs.octave.org");
   double knob_storage[COLAMD_KNOBS];
   double *knobs = &knob_storage[0];
   COLAMD_NAME (_set_defaults) (knobs);
@@ -587,7 +590,8 @@
 
   // Allocate workspace for symamd
   OCTAVE_LOCAL_BUFFER (octave_idx_type, perm, n_col+1);
-  static_assert (COLAMD_STATS <= 40, "symamd: # of COLAMD_STATS exceeded.  Please report this to bugs.octave.org");
+  static_assert (COLAMD_STATS <= 40,
+                 "symamd: # of COLAMD_STATS exceeded.  Please report this to bugs.octave.org");
   octave::suitesparse_integer stats_storage[COLAMD_STATS];
   octave::suitesparse_integer *stats = &stats_storage[0];
   if (! SYMAMD_NAME () (n_col, octave::to_suitesparse_intptr (ridx),
diff -r 0fa21907e54c -r b018f553fd85 libinterp/octave-value/cdef-class.cc
--- a/libinterp/octave-value/cdef-class.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/octave-value/cdef-class.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -314,7 +314,8 @@
 
   void
   cdef_class::cdef_class_rep::find_methods (std::map<std::string, cdef_method>& meths,
-                                            bool only_inherited, bool include_ctor)
+                                            bool only_inherited,
+                                            bool include_ctor)
   {
     load_all_methods ();
 
diff -r 0fa21907e54c -r b018f553fd85 libinterp/octave-value/cdef-manager.cc
--- a/libinterp/octave-value/cdef-manager.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/octave-value/cdef-manager.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -790,6 +790,7 @@
           {
             all_handle_compatible = all_handle_compatible
               && cl.get ("HandleCompatible").bool_value ();
+
             has_handle_class = has_handle_class || cl.is_handle_class ();
           }
 
diff -r 0fa21907e54c -r b018f553fd85 libinterp/octave-value/cdef-manager.h
--- a/libinterp/octave-value/cdef-manager.h	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/octave-value/cdef-manager.h	Fri Jan 10 17:25:12 2020 -0800
@@ -38,8 +38,7 @@
 {
   class interpreter;
 
-  class
-    cdef_manager
+  class cdef_manager
   {
   public:
 
@@ -53,7 +52,8 @@
 
     ~cdef_manager (void) = default;
 
-    cdef_class find_class (const std::string& name, bool error_if_not_found = true,
+    cdef_class find_class (const std::string& name,
+                           bool error_if_not_found = true,
                            bool load_if_not_found = true);
 
     octave_value find_method_symbol (const std::string& method_name,
@@ -92,46 +92,44 @@
 
     const cdef_package& meta (void) const { return m_meta; }
 
-    cdef_class
-      make_class (const std::string& name,
-                  const std::list<cdef_class>& super_list = std::list<cdef_class> ());
+    cdef_class make_class (const std::string& name,
+                           const std::list<cdef_class>& super_list = std::list<cdef_class> ());
 
-    cdef_class
-      make_class (const std::string& name, const cdef_class& super);
+    cdef_class make_class (const std::string& name, const cdef_class& super);
 
-    cdef_class
-      make_meta_class (const std::string& name, const cdef_class& super);
+    cdef_class make_meta_class (const std::string& name,
+                                const cdef_class& super);
 
-    cdef_property
-      make_property (const cdef_class& cls, const std::string& name,
-                     const octave_value& get_method = Matrix (),
-                     const std::string& get_access = "public",
-                     const octave_value& set_method = Matrix (),
-                     const std::string& set_access = "public");
+    cdef_property make_property (const cdef_class& cls,
+                                 const std::string& name,
+                                 const octave_value& get_method = Matrix (),
+                                 const std::string& get_access = "public",
+                                 const octave_value& set_method = Matrix (),
+                                 const std::string& set_access = "public");
 
-    cdef_property
-      make_attribute (const cdef_class& cls, const std::string& name);
+    cdef_property make_attribute (const cdef_class& cls,
+                                  const std::string& name);
 
-    cdef_method
-      make_method (const cdef_class& cls, const std::string& name,
-                   const octave_value& fcn,
-                   const std::string& m_access = "public",
-                   bool is_static = false);
+    cdef_method make_method (const cdef_class& cls,
+                             const std::string& name,
+                             const octave_value& fcn,
+                             const std::string& m_access = "public",
+                             bool is_static = false);
 
-    cdef_method
-      make_method (const cdef_class& cls, const std::string& name,
-                   octave_builtin::fcn ff,
-                   const std::string& m_access = "public",
-                   bool is_static = false);
+    cdef_method make_method (const cdef_class& cls,
+                             const std::string& name,
+                             octave_builtin::fcn ff,
+                             const std::string& m_access = "public",
+                             bool is_static = false);
 
-    cdef_method
-      make_method (const cdef_class& cls, const std::string& name,
-                   octave_builtin::meth mm,
-                   const std::string& m_access = "public",
-                   bool is_static = false);
+    cdef_method make_method (const cdef_class& cls,
+                             const std::string& name,
+                             octave_builtin::meth mm,
+                             const std::string& m_access = "public",
+                             bool is_static = false);
 
-    cdef_package
-      make_package (const std::string& nm, const std::string& parent = "");
+    cdef_package make_package (const std::string& nm,
+                               const std::string& parent = "");
 
     octave_value find_method (const std::string& class_name,
                               const std::string& name) const;
diff -r 0fa21907e54c -r b018f553fd85 libinterp/octave-value/cdef-method.cc
--- a/libinterp/octave-value/cdef-method.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/octave-value/cdef-method.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -97,7 +97,7 @@
               {
                 octave_value ov_fcn
                   = load_fcn_from_file (file_name, dir_name,
-                                                dispatch_type, pack_name);
+                                        dispatch_type, pack_name);
 
                 if (ov_fcn.is_defined ())
                   {
diff -r 0fa21907e54c -r b018f553fd85 libinterp/octave-value/cdef-object.cc
--- a/libinterp/octave-value/cdef-object.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/octave-value/cdef-object.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -377,9 +377,9 @@
             // array.index doesn't create a new blank entry (bug #46660).
             const octave_idx_type one = static_cast<octave_idx_type> (1);
             const octave_value_list& ival = ivl.length () >= 2
-              ? ivl : ((array.dims ()(0) == 1)
-                       ? ovl (one, ivl(0))
-                       : ovl (ivl(0), one));
+                                            ? ivl : ((array.dims ()(0) == 1)
+                                                     ? ovl (one, ivl(0))
+                                                     : ovl (ivl(0), one));
 
             bool is_scalar = true;
 
diff -r 0fa21907e54c -r b018f553fd85 libinterp/octave-value/cdef-package.h
--- a/libinterp/octave-value/cdef-package.h	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/octave-value/cdef-package.h	Fri Jan 10 17:25:12 2020 -0800
@@ -123,9 +123,11 @@
       typedef std::map<std::string, cdef_class>::iterator class_iterator;
       typedef std::map<std::string, cdef_class>::const_iterator class_const_iterator;
       typedef std::map<std::string, octave_value>::iterator function_iterator;
-      typedef std::map<std::string, octave_value>::const_iterator function_const_iterator;
+      typedef std::map<std::string, octave_value>::const_iterator
+        function_const_iterator;
       typedef std::map<std::string, cdef_package>::iterator package_iterator;
-      typedef std::map<std::string, cdef_package>::const_iterator package_const_iterator;
+      typedef std::map<std::string, cdef_package>::const_iterator
+        package_const_iterator;
 
       cdef_package_rep (const cdef_package_rep& p)
         : cdef_meta_object_rep (p), full_name (p.full_name),
diff -r 0fa21907e54c -r b018f553fd85 libinterp/octave-value/cdef-property.cc
--- a/libinterp/octave-value/cdef-property.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/octave-value/cdef-property.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -80,7 +80,8 @@
             // is the first return value.
 
             tree_parameter_list *pl = uf->is_classdef_constructor ()
-              ? uf->return_list () : uf->parameter_list ();
+                                      ? uf->return_list ()
+                                      : uf->parameter_list ();
 
             if (pl && pl->size () > 0)
               {
diff -r 0fa21907e54c -r b018f553fd85 libinterp/octave-value/ov-class.cc
--- a/libinterp/octave-value/ov-class.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/octave-value/ov-class.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -1414,7 +1414,7 @@
     goto error_cleanup;
 
   hdims[0] = 0;
-  space_hid = H5Screate_simple (0 , hdims, nullptr);
+  space_hid = H5Screate_simple (0, hdims, nullptr);
   if (space_hid < 0)
     goto error_cleanup;
 #if defined (HAVE_HDF5_18)
diff -r 0fa21907e54c -r b018f553fd85 libinterp/octave-value/ov-classdef.cc
--- a/libinterp/octave-value/ov-classdef.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/octave-value/ov-classdef.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -580,7 +580,8 @@
   if (! cls.ok ())
     error ("invalid class: %s", class_name.c_str ());
 
-  std::map<std::string, octave::cdef_property> property_map = cls.get_property_map ();
+  std::map<std::string, octave::cdef_property> property_map =
+    cls.get_property_map ();
 
   std::list<std::string> property_names;
 
diff -r 0fa21907e54c -r b018f553fd85 libinterp/octave-value/ov-cx-sparse.cc
--- a/libinterp/octave-value/ov-cx-sparse.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/octave-value/ov-cx-sparse.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -360,7 +360,8 @@
 }
 
 bool
-octave_sparse_complex_matrix::save_hdf5 (octave_hdf5_id loc_id, const char *name,
+octave_sparse_complex_matrix::save_hdf5 (octave_hdf5_id loc_id,
+                                         const char *name,
                                          bool save_as_floats)
 {
   bool retval = false;
diff -r 0fa21907e54c -r b018f553fd85 libinterp/octave-value/ov-fcn-handle.cc
--- a/libinterp/octave-value/ov-fcn-handle.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/octave-value/ov-fcn-handle.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -988,7 +988,7 @@
   OCTAVE_LOCAL_BUFFER (hsize_t, hdims, 2);
   hdims[0] = 0;
   hdims[1] = 0;
-  space_hid = H5Screate_simple (0 , hdims, nullptr);
+  space_hid = H5Screate_simple (0, hdims, nullptr);
   if (space_hid < 0)
     {
       H5Tclose (type_hid);
@@ -1052,7 +1052,7 @@
       octave_user_function *f = m_fcn.user_function_value ();
 
       octave_user_function::local_vars_map local_vars
-                     = f->local_var_init_vals ();
+        = f->local_var_init_vals ();
 
       size_t varlen = local_vars.size ();
 
@@ -1118,7 +1118,7 @@
       H5Sclose (space_hid);
       hdims[0] = 1;
       hdims[1] = octaveroot.length ();
-      space_hid = H5Screate_simple (0 , hdims, nullptr);
+      space_hid = H5Screate_simple (0, hdims, nullptr);
       if (space_hid < 0)
         {
           H5Tclose (type_hid);
@@ -1154,7 +1154,7 @@
       H5Sclose (space_hid);
       hdims[0] = 1;
       hdims[1] = fpath.length ();
-      space_hid = H5Screate_simple (0 , hdims, nullptr);
+      space_hid = H5Screate_simple (0, hdims, nullptr);
       if (space_hid < 0)
         {
           H5Tclose (type_hid);
diff -r 0fa21907e54c -r b018f553fd85 libinterp/octave-value/ov-fcn-inline.cc
--- a/libinterp/octave-value/ov-fcn-inline.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/octave-value/ov-fcn-inline.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -371,7 +371,7 @@
     }
 
   hdims[0] = 0;
-  space_hid = H5Screate_simple (0 , hdims, nullptr);
+  space_hid = H5Screate_simple (0, hdims, nullptr);
   if (space_hid < 0)
     {
       H5Tclose (type_hid);
diff -r 0fa21907e54c -r b018f553fd85 libinterp/octave-value/ov-fcn.h
--- a/libinterp/octave-value/ov-fcn.h	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/octave-value/ov-fcn.h	Fri Jan 10 17:25:12 2020 -0800
@@ -232,7 +232,7 @@
         const octave_value_list& args,
         octave::stack_frame *closure_context);
 
- protected:
+protected:
 
   octave_function (const std::string& nm,
                    const std::string& ds = "")
diff -r 0fa21907e54c -r b018f553fd85 libinterp/octave-value/ov-java.cc
--- a/libinterp/octave-value/ov-java.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/octave-value/ov-java.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -519,15 +519,17 @@
 #if defined (OCTAVE_USE_WINDOWS_API)
   std::string subdirs[] = {"bin/client", "bin/server"};
 #else
-  std::string subdirs[] = {"jre/lib/server", "jre/lib", "lib/client",
-    "lib/server", "jre/lib/amd64/client", "jre/lib/amd64/server",
-    "jre/lib/i386/client", "jre/lib/i386/server"};
+  std::string subdirs[] = {"jre/lib/server", "jre/lib",
+                           "lib/client", "lib/server",
+                           "jre/lib/amd64/client", "jre/lib/amd64/server",
+                           "jre/lib/i386/client", "jre/lib/i386/server"
+                          };
 #endif
 
   for (size_t i = 0; i < sizeof (subdirs) / sizeof (subdirs[0]); i++)
     {
       std::string candidate = java_home_path + "/" + subdirs[i]
-                            + "/" LIBJVM_FILE_NAME;
+                              + "/" LIBJVM_FILE_NAME;
       if (octave::sys::file_stat (candidate))
         return candidate;
     }
@@ -679,7 +681,7 @@
               // time?  Or is it OK for the options to be fixed here?
 
               std::string java_home_cmd = std::string (JAVA_HOME_CMD)
-                + " --failfast --version 1.6+ 2>/dev/null";
+                                          + " --failfast --version 1.6+ 2>/dev/null";
 
               octave::process_execution_result rslt
                 = octave::run_command_and_return_output (java_home_cmd);
@@ -1075,7 +1077,7 @@
 {
   jclass_ref ocls (jni_env, jni_env->FindClass ("[I"));
   jobjectArray retval = jni_env->NewObjectArray (idx.length (), ocls, nullptr);
- // Here retval has the same length as idx
+  // Here retval has the same length as idx
 
   // Fill in entries of idx into retval
   for (int i = 0; i < idx.length (); i++)
@@ -1705,7 +1707,7 @@
       // into a String[], not into a char array
 
       if (val.is_double_type ())
-        UNBOX_PRIMITIVE_ARRAY ( , , jdouble,  Double);
+        UNBOX_PRIMITIVE_ARRAY ( , , jdouble, Double);
       else if (val.islogical ())
         UNBOX_PRIMITIVE_ARRAY (bool_, bool, jboolean, Boolean);
       else if (val.isfloat ())
diff -r 0fa21907e54c -r b018f553fd85 libinterp/octave-value/ov-typeinfo.h
--- a/libinterp/octave-value/ov-typeinfo.h	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/octave-value/ov-typeinfo.h	Fri Jan 10 17:25:12 2020 -0800
@@ -50,20 +50,20 @@
     typedef void (*non_const_unary_op_fcn) (octave_base_value&);
 
     typedef octave_value (*binary_class_op_fcn)
-    (const octave_value&, const octave_value&);
+      (const octave_value&, const octave_value&);
 
     typedef octave_value (*binary_op_fcn)
-    (const octave_base_value&, const octave_base_value&);
+      (const octave_base_value&, const octave_base_value&);
 
     typedef octave_value (*cat_op_fcn)
-    (octave_base_value&, const octave_base_value&,
+      (octave_base_value&, const octave_base_value&,
      const Array<octave_idx_type>& ra_idx);
 
     typedef octave_value (*assign_op_fcn)
-    (octave_base_value&, const octave_value_list&, const octave_base_value&);
+      (octave_base_value&, const octave_value_list&, const octave_base_value&);
 
     typedef octave_value (*assignany_op_fcn)
-    (octave_base_value&, const octave_value_list&, const octave_value&);
+      (octave_base_value&, const octave_value_list&, const octave_value&);
 
     explicit type_info (int init_tab_sz = 16);
 
diff -r 0fa21907e54c -r b018f553fd85 libinterp/parse-tree/bp-table.cc
--- a/libinterp/parse-tree/bp-table.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/parse-tree/bp-table.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -551,7 +551,8 @@
   // If END_LINE != 0, *END_LINE is set to last line of the returned function.
 
   static octave_user_code * find_fcn_by_line (octave_user_code *main_fcn,
-                                              int lineno, int *end_line = nullptr)
+                                              int lineno,
+                                              int *end_line = nullptr)
   {
     octave_user_code *retval = nullptr;
     octave_user_code *next_fcn = nullptr;  // 1st function starting after lineno
diff -r 0fa21907e54c -r b018f553fd85 libinterp/parse-tree/jit-ir.h
--- a/libinterp/parse-tree/jit-ir.h	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/parse-tree/jit-ir.h	Fri Jan 10 17:25:12 2020 -0800
@@ -93,10 +93,11 @@
   typedef jit_const<Complex, jit_typeinfo::get_complex> jit_const_complex;
   typedef jit_const<octave_idx_type, jit_typeinfo::get_index> jit_const_index;
 
-  typedef jit_const<std::string, jit_typeinfo::get_string, const std::string&,
-                    true> jit_const_string;
+  typedef jit_const<std::string, jit_typeinfo::get_string,
+                    const std::string&, true>
+    jit_const_string;
   typedef jit_const<jit_range, jit_typeinfo::get_range, const jit_range&>
-  jit_const_range;
+    jit_const_range;
 
   class jit_ir_walker;
   class jit_use;
diff -r 0fa21907e54c -r b018f553fd85 libinterp/parse-tree/jit-typeinfo.h
--- a/libinterp/parse-tree/jit-typeinfo.h	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/parse-tree/jit-typeinfo.h	Fri Jan 10 17:25:12 2020 -0800
@@ -432,7 +432,7 @@
     };
 
     typedef std::map<const signature_vec *, jit_function *, signature_cmp>
-    generated_map;
+      generated_map;
 
     mutable generated_map m_generated;
 
diff -r 0fa21907e54c -r b018f553fd85 libinterp/parse-tree/pt-classdef.h
--- a/libinterp/parse-tree/pt-classdef.h	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/parse-tree/pt-classdef.h	Fri Jan 10 17:25:12 2020 -0800
@@ -235,7 +235,8 @@
     std::string m_cls_name;
   };
 
-  class tree_classdef_superclass_list : public base_list<tree_classdef_superclass *>
+  class tree_classdef_superclass_list
+    : public base_list<tree_classdef_superclass *>
   {
   public:
 
@@ -636,17 +637,23 @@
   {
   public:
 
-    typedef std::list<tree_classdef_properties_block *>::iterator properties_list_iterator;
-    typedef std::list<tree_classdef_properties_block *>::const_iterator properties_list_const_iterator;
+    typedef std::list<tree_classdef_properties_block *>::iterator
+      properties_list_iterator;
+    typedef std::list<tree_classdef_properties_block *>::const_iterator
+      properties_list_const_iterator;
 
-    typedef std::list<tree_classdef_methods_block *>::iterator methods_list_iterator;
-    typedef std::list<tree_classdef_methods_block *>::const_iterator methods_list_const_iterator;
+    typedef std::list<tree_classdef_methods_block *>::iterator
+      methods_list_iterator;
+    typedef std::list<tree_classdef_methods_block *>::const_iterator
+      methods_list_const_iterator;
 
     typedef std::list<tree_classdef_events_block *>::iterator events_list_iterator;
-    typedef std::list<tree_classdef_events_block *>::const_iterator events_list_const_iterator;
+    typedef std::list<tree_classdef_events_block *>::const_iterator
+      events_list_const_iterator;
 
     typedef std::list<tree_classdef_enum_block *>::iterator enum_list_iterator;
-    typedef std::list<tree_classdef_enum_block *>::const_iterator enum_list_const_iterator;
+    typedef std::list<tree_classdef_enum_block *>::const_iterator
+      enum_list_const_iterator;
 
     tree_classdef_body (void)
       : m_properties_lst (), m_methods_lst (), m_events_lst (), m_enum_lst ()
diff -r 0fa21907e54c -r b018f553fd85 libinterp/parse-tree/pt-eval.cc
--- a/libinterp/parse-tree/pt-eval.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/parse-tree/pt-eval.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -1013,7 +1013,7 @@
 
   void
   tree_evaluator::top_level_assign (const std::string& name,
-                                const octave_value& val)
+                                    const octave_value& val)
   {
     m_call_stack.set_top_level_value (name, val);
   }
diff -r 0fa21907e54c -r b018f553fd85 libinterp/parse-tree/pt-eval.h
--- a/libinterp/parse-tree/pt-eval.h	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/parse-tree/pt-eval.h	Fri Jan 10 17:25:12 2020 -0800
@@ -139,7 +139,7 @@
         m_breaking (0), m_continuing (0), m_returning (0),
         m_indexed_object (nullptr), m_index_position (0),
         m_num_indices (0)
-      { }
+    { }
 
     // No copying!
 
diff -r 0fa21907e54c -r b018f553fd85 libinterp/parse-tree/pt-idx.cc
--- a/libinterp/parse-tree/pt-idx.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/parse-tree/pt-idx.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -642,11 +642,13 @@
         switch (m_type[i])
           {
           case '(':
-            idx_list.push_back (make_value_list (tw, *p_args, *p_arg_nm, &partial_expr_val));
+            idx_list.push_back (make_value_list (tw, *p_args, *p_arg_nm,
+                                                 &partial_expr_val));
             break;
 
           case '{':
-            idx_list.push_back (make_value_list (tw, *p_args, *p_arg_nm, &partial_expr_val));
+            idx_list.push_back (make_value_list (tw, *p_args, *p_arg_nm,
+                                                 &partial_expr_val));
             break;
 
           case '.':