diff libinterp/parse-tree/pt-assign.cc @ 31607:aac27ad79be6 stable

maint: Re-indent code after switch to using namespace macros. * build-env.h, build-env.in.cc, Cell.h, __betainc__.cc, __eigs__.cc, __ftp__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __magick_read__.cc, __pchip_deriv__.cc, amd.cc, base-text-renderer.cc, base-text-renderer.h, besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, dasrt.cc, data.cc, debug.cc, defaults.cc, defaults.h, det.cc, display.cc, display.h, dlmread.cc, dynamic-ld.cc, dynamic-ld.h, ellipj.cc, environment.cc, environment.h, error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc, file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h, gcd.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h, graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, gsvd.cc, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.cc, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, inv.cc, jsondecode.cc, jsonencode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, lookup.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, lsode.cc, lu.cc, mappers.cc, matrix_type.cc, max.cc, mex.cc, mexproto.h, mxarray.h, mxtypes.in.h, oct-errno.in.cc, oct-hdf5-types.cc, oct-hist.cc, oct-hist.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.h, oct-process.cc, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h, octave-default-image.h, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc, pow2.cc, pr-output.cc, psi.cc, qr.cc, quadcc.cc, rand.cc, regexp.cc, settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xpow.cc, sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfns.cc, svd.cc, syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, time.cc, toplev.cc, typecast.cc, url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h, variables.cc, variables.h, xdiv.cc, __delaunayn__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audioread.cc, convhulln.cc, gzip.cc, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.h, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-lazy-idx.cc, ov-legacy-range.cc, ov-magic-int.cc, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.h, octave.cc, octave.h, op-b-sbm.cc, op-bm-sbm.cc, op-cs-scm.cc, op-fm-fcm.cc, op-fs-fcm.cc, op-s-scm.cc, op-scm-cs.cc, op-scm-s.cc, op-sm-cs.cc, ops.h, anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, oct-lvalue.cc, oct-lvalue.h, parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc, pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h, idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h, aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h, gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h, oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h, randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h, lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc, oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc, oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h: Re-indent code after switch to using namespace macros.
author Rik <rik@octave.org>
date Thu, 01 Dec 2022 18:02:15 -0800
parents e88a07dec498
children 597f3ee61a48
line wrap: on
line diff
--- a/libinterp/parse-tree/pt-assign.cc	Thu Dec 01 14:23:45 2022 -0800
+++ b/libinterp/parse-tree/pt-assign.cc	Thu Dec 01 18:02:15 2022 -0800
@@ -38,317 +38,317 @@
 
 OCTAVE_BEGIN_NAMESPACE(octave)
 
-  // Simple assignment expressions.
+// Simple assignment expressions.
 
-  tree_simple_assignment::tree_simple_assignment (tree_expression *le,
-                                                  tree_expression *re,
-                                                  bool plhs, int l, int c,
-                                                  octave_value::assign_op t)
-    : tree_expression (l, c), m_lhs (le), m_rhs (re), m_preserve (plhs),
-      m_ans_assign (), m_etype (t)
-  { }
+tree_simple_assignment::tree_simple_assignment (tree_expression *le,
+    tree_expression *re,
+    bool plhs, int l, int c,
+    octave_value::assign_op t)
+  : tree_expression (l, c), m_lhs (le), m_rhs (re), m_preserve (plhs),
+    m_ans_assign (), m_etype (t)
+{ }
 
-  tree_simple_assignment::~tree_simple_assignment (void)
-  {
-    if (! m_preserve)
-      delete m_lhs;
+tree_simple_assignment::~tree_simple_assignment (void)
+{
+  if (! m_preserve)
+    delete m_lhs;
 
-    delete m_rhs;
-  }
+  delete m_rhs;
+}
 
-  std::string
-  tree_simple_assignment::oper (void) const
-  {
-    return octave_value::assign_op_as_string (m_etype);
-  }
+std::string
+tree_simple_assignment::oper (void) const
+{
+  return octave_value::assign_op_as_string (m_etype);
+}
 
-  tree_expression *
-  tree_simple_assignment::dup (symbol_scope& scope) const
-  {
-    tree_simple_assignment *new_sa
-      = new tree_simple_assignment (m_lhs ? m_lhs->dup (scope) : nullptr,
-                                    m_rhs ? m_rhs->dup (scope) : nullptr,
-                                    m_preserve, m_etype);
+tree_expression *
+tree_simple_assignment::dup (symbol_scope& scope) const
+{
+  tree_simple_assignment *new_sa
+    = new tree_simple_assignment (m_lhs ? m_lhs->dup (scope) : nullptr,
+                                  m_rhs ? m_rhs->dup (scope) : nullptr,
+                                  m_preserve, m_etype);
 
-    new_sa->copy_base (*this);
+  new_sa->copy_base (*this);
 
-    return new_sa;
-  }
+  return new_sa;
+}
 
-  octave_value
-  tree_simple_assignment::evaluate (tree_evaluator& tw, int)
-  {
-    octave_value val;
+octave_value
+tree_simple_assignment::evaluate (tree_evaluator& tw, int)
+{
+  octave_value val;
 
-    if (m_rhs)
-      {
-        try
+  if (m_rhs)
+    {
+      try
+        {
+          octave_lvalue ult = m_lhs->lvalue (tw);
+
+          std::list<octave_lvalue> lvalue_list;
+          lvalue_list.push_back (ult);
+
+          unwind_action act ([&tw] (const std::list<octave_lvalue> *lvl)
           {
-            octave_lvalue ult = m_lhs->lvalue (tw);
-
-            std::list<octave_lvalue> lvalue_list;
-            lvalue_list.push_back (ult);
-
-            unwind_action act ([&tw] (const std::list<octave_lvalue> *lvl)
-                               {
-                                 tw.set_lvalue_list (lvl);
-                               }, tw.lvalue_list ());
-            tw.set_lvalue_list (&lvalue_list);
+            tw.set_lvalue_list (lvl);
+          }, tw.lvalue_list ());
+          tw.set_lvalue_list (&lvalue_list);
 
-            if (ult.numel () != 1)
-              err_invalid_structure_assignment ();
+          if (ult.numel () != 1)
+            err_invalid_structure_assignment ();
 
-            octave_value rhs_val = m_rhs->evaluate (tw);
+          octave_value rhs_val = m_rhs->evaluate (tw);
 
-            if (rhs_val.is_undefined ())
-              error ("value on right hand side of assignment is undefined");
+          if (rhs_val.is_undefined ())
+            error ("value on right hand side of assignment is undefined");
 
-            if (rhs_val.is_cs_list ())
-              {
-                const octave_value_list lst = rhs_val.list_value ();
+          if (rhs_val.is_cs_list ())
+            {
+              const octave_value_list lst = rhs_val.list_value ();
 
-                if (lst.empty ())
-                  error ("invalid number of elements on RHS of assignment");
+              if (lst.empty ())
+                error ("invalid number of elements on RHS of assignment");
 
-                rhs_val = lst(0);
-              }
+              rhs_val = lst(0);
+            }
 
-            ult.assign (m_etype, rhs_val);
+          ult.assign (m_etype, rhs_val);
 
-            if (m_etype == octave_value::op_asn_eq)
-              val = rhs_val;
-            else
-              val = ult.value ();
+          if (m_etype == octave_value::op_asn_eq)
+            val = rhs_val;
+          else
+            val = ult.value ();
 
-            if (print_result () && tw.statement_printing_enabled ())
-              {
-                // We clear any index here so that we can
-                // get the new value of the referenced
-                // object below, instead of the indexed
-                // value (which should be the same as the
-                // right hand side value).
+          if (print_result () && tw.statement_printing_enabled ())
+            {
+              // We clear any index here so that we can
+              // get the new value of the referenced
+              // object below, instead of the indexed
+              // value (which should be the same as the
+              // right hand side value).
 
-                ult.clear_index ();
+              ult.clear_index ();
 
-                octave_value lhs_val = ult.value ();
+              octave_value lhs_val = ult.value ();
 
-                octave_value_list args = ovl (lhs_val);
-                args.stash_name_tags (string_vector (m_lhs->name ()));
-                feval ("display", args);
-              }
-          }
-        catch (index_exception& ie)
-          {
-            ie.set_var (m_lhs->name ());
-            std::string msg = ie.message ();
-            error_with_id (ie.err_id (), "%s", msg.c_str ());
-          }
-      }
+              octave_value_list args = ovl (lhs_val);
+              args.stash_name_tags (string_vector (m_lhs->name ()));
+              feval ("display", args);
+            }
+        }
+      catch (index_exception& ie)
+        {
+          ie.set_var (m_lhs->name ());
+          std::string msg = ie.message ();
+          error_with_id (ie.err_id (), "%s", msg.c_str ());
+        }
+    }
 
-    return val;
-  }
+  return val;
+}
 
-  // Multi-valued assignment expressions.
+// Multi-valued assignment expressions.
 
-  tree_multi_assignment::tree_multi_assignment (tree_argument_list *lst,
-                                                tree_expression *r,
-                                                bool plhs, int l, int c)
-    : tree_expression (l, c), m_lhs (lst), m_rhs (r), m_preserve (plhs)
-  { }
+tree_multi_assignment::tree_multi_assignment (tree_argument_list *lst,
+    tree_expression *r,
+    bool plhs, int l, int c)
+  : tree_expression (l, c), m_lhs (lst), m_rhs (r), m_preserve (plhs)
+{ }
 
-  tree_multi_assignment::~tree_multi_assignment (void)
-  {
-    if (! m_preserve)
-      delete m_lhs;
+tree_multi_assignment::~tree_multi_assignment (void)
+{
+  if (! m_preserve)
+    delete m_lhs;
 
-    delete m_rhs;
-  }
+  delete m_rhs;
+}
 
-  std::string
-  tree_multi_assignment::oper (void) const
-  {
-    return octave_value::assign_op_as_string (op_type ());
-  }
+std::string
+tree_multi_assignment::oper (void) const
+{
+  return octave_value::assign_op_as_string (op_type ());
+}
 
-  tree_expression *
-  tree_multi_assignment::dup (symbol_scope&) const
-  {
-    panic_impossible ();
-    return nullptr;
-  }
+tree_expression *
+tree_multi_assignment::dup (symbol_scope&) const
+{
+  panic_impossible ();
+  return nullptr;
+}
 
-  octave_value_list
-  tree_multi_assignment::evaluate_n (tree_evaluator& tw, int)
-  {
-    octave_value_list val;
+octave_value_list
+tree_multi_assignment::evaluate_n (tree_evaluator& tw, int)
+{
+  octave_value_list val;
 
-    if (m_rhs)
-      {
-        std::list<octave_lvalue> lvalue_list = tw.make_lvalue_list (m_lhs);
+  if (m_rhs)
+    {
+      std::list<octave_lvalue> lvalue_list = tw.make_lvalue_list (m_lhs);
 
-        unwind_action act ([&tw] (const std::list<octave_lvalue> *lvl)
-                           {
-                             tw.set_lvalue_list (lvl);
-                           }, tw.lvalue_list ());
-        tw.set_lvalue_list (&lvalue_list);
+      unwind_action act ([&tw] (const std::list<octave_lvalue> *lvl)
+      {
+        tw.set_lvalue_list (lvl);
+      }, tw.lvalue_list ());
+      tw.set_lvalue_list (&lvalue_list);
 
-        octave_idx_type n_out = 0;
+      octave_idx_type n_out = 0;
 
-        for (const auto& lval : lvalue_list)
-          n_out += lval.numel ();
+      for (const auto& lval : lvalue_list)
+        n_out += lval.numel ();
 
-        // The following trick is used to keep rhs_val constant.
-        const octave_value_list rhs_val1 = m_rhs->evaluate_n (tw, n_out);
-        const octave_value_list rhs_val = (rhs_val1.length () == 1
-                                           && rhs_val1(0).is_cs_list ()
-                                           ? rhs_val1(0).list_value ()
-                                           : rhs_val1);
+      // The following trick is used to keep rhs_val constant.
+      const octave_value_list rhs_val1 = m_rhs->evaluate_n (tw, n_out);
+      const octave_value_list rhs_val = (rhs_val1.length () == 1
+                                         && rhs_val1(0).is_cs_list ()
+                                         ? rhs_val1(0).list_value ()
+                                         : rhs_val1);
 
-        tw.set_lvalue_list (nullptr);
+      tw.set_lvalue_list (nullptr);
 
-        octave_idx_type k = 0;
+      octave_idx_type k = 0;
 
-        octave_idx_type n = rhs_val.length ();
+      octave_idx_type n = rhs_val.length ();
 
-        // To avoid copying per elements and possible optimizations, we
-        // postpone joining the final values.
-        std::list<octave_value_list> retval_list;
+      // To avoid copying per elements and possible optimizations, we
+      // postpone joining the final values.
+      std::list<octave_value_list> retval_list;
 
-        auto q = m_lhs->begin ();
+      auto q = m_lhs->begin ();
 
-        for (octave_lvalue ult : lvalue_list)
-          {
-            tree_expression *lhs_elt = *q++;
+      for (octave_lvalue ult : lvalue_list)
+        {
+          tree_expression *lhs_elt = *q++;
 
-            octave_idx_type nel = ult.numel ();
+          octave_idx_type nel = ult.numel ();
 
-            if (nel != 1)
-              {
-                // Huge kluge so that wrapper scripts with lines like
-                //
-                //   [varargout{1:nargout}] = fcn (args);
-                //
-                // or
-                //
-                //   varargout = cell (1, nargout);
-                //   [varargout{1:nargout}] = fcn (args);
-                //
-                // or
-                //
-                //   varargout = cell (1, nargout);
-                //   [varargout{:}] = fcn (args);
-                //
-                // Will work the same as calling fcn directly when nargout
-                // is 0 and fcn produces more than one output even when
-                // nargout is 0.  See also bug #43813.
+          if (nel != 1)
+            {
+              // Huge kluge so that wrapper scripts with lines like
+              //
+              //   [varargout{1:nargout}] = fcn (args);
+              //
+              // or
+              //
+              //   varargout = cell (1, nargout);
+              //   [varargout{1:nargout}] = fcn (args);
+              //
+              // or
+              //
+              //   varargout = cell (1, nargout);
+              //   [varargout{:}] = fcn (args);
+              //
+              // Will work the same as calling fcn directly when nargout
+              // is 0 and fcn produces more than one output even when
+              // nargout is 0.  See also bug #43813.
 
-                if (lvalue_list.size () == 1 && nel == 0 && n > 0
-                    && ! ult.is_black_hole () && ult.index_type () == "{"
-                    && (ult.index_is_empty ()
-                        || (ult.is_defined () && ult.index_is_colon ())))
-                  {
-                    // Convert undefined lvalue with empty index to a cell
-                    // array with a single value and indexed by 1 to
-                    // handle a single output.
+              if (lvalue_list.size () == 1 && nel == 0 && n > 0
+                  && ! ult.is_black_hole () && ult.index_type () == "{"
+                  && (ult.index_is_empty ()
+                      || (ult.is_defined () && ult.index_is_colon ())))
+                {
+                  // Convert undefined lvalue with empty index to a cell
+                  // array with a single value and indexed by 1 to
+                  // handle a single output.
 
-                    nel = 1;
+                  nel = 1;
 
-                    ult.define (Cell (1, 1));
+                  ult.define (Cell (1, 1));
 
-                    ult.clear_index ();
-                    std::list<octave_value_list> idx;
-                    idx.push_back (octave_value_list (octave_value (1)));
-                    ult.set_index ("{", idx);
-                  }
+                  ult.clear_index ();
+                  std::list<octave_value_list> idx;
+                  idx.push_back (octave_value_list (octave_value (1)));
+                  ult.set_index ("{", idx);
+                }
 
-                if (k + nel > n)
-                  error ("some elements undefined in return list");
+              if (k + nel > n)
+                error ("some elements undefined in return list");
 
-                // This element of the return list expects a
-                // comma-separated list of values.  Slicing avoids
-                // copying.
+              // This element of the return list expects a
+              // comma-separated list of values.  Slicing avoids
+              // copying.
 
-                octave_value_list ovl = rhs_val.slice (k, nel);
+              octave_value_list ovl = rhs_val.slice (k, nel);
 
-                ult.assign (octave_value::op_asn_eq, octave_value (ovl));
+              ult.assign (octave_value::op_asn_eq, octave_value (ovl));
 
-                retval_list.push_back (ovl);
+              retval_list.push_back (ovl);
 
-                k += nel;
-              }
-            else
-              {
-                if (k < n)
-                  {
-                    if (ult.is_black_hole ())
-                      {
-                        k++;
-                        continue;
-                      }
-                    else
-                      {
-                        octave_value tmp = rhs_val(k);
+              k += nel;
+            }
+          else
+            {
+              if (k < n)
+                {
+                  if (ult.is_black_hole ())
+                    {
+                      k++;
+                      continue;
+                    }
+                  else
+                    {
+                      octave_value tmp = rhs_val(k);
 
-                        if (tmp.is_undefined ())
-                          error ("element number %" OCTAVE_IDX_TYPE_FORMAT
-                                 " undefined in return list", k+1);
+                      if (tmp.is_undefined ())
+                        error ("element number %" OCTAVE_IDX_TYPE_FORMAT
+                               " undefined in return list", k+1);
 
-                        ult.assign (octave_value::op_asn_eq, tmp);
+                      ult.assign (octave_value::op_asn_eq, tmp);
 
-                        retval_list.push_back (tmp);
+                      retval_list.push_back (tmp);
 
-                        k++;
-                      }
-                  }
-                else
-                  {
-                    // This can happen for a function like
-                    //
-                    //   function varargout = f ()
-                    //     varargout{1} = nargout;
-                    //   endfunction
-                    //
-                    // called with
-                    //
-                    //    [a, ~] = f ();
-                    //
-                    // Then the list of of RHS values will contain one
-                    // element but we are iterating over the list of all
-                    // RHS values.  We shouldn't complain that a value we
-                    // don't need is missing from the list.
+                      k++;
+                    }
+                }
+              else
+                {
+                  // This can happen for a function like
+                  //
+                  //   function varargout = f ()
+                  //     varargout{1} = nargout;
+                  //   endfunction
+                  //
+                  // called with
+                  //
+                  //    [a, ~] = f ();
+                  //
+                  // Then the list of of RHS values will contain one
+                  // element but we are iterating over the list of all
+                  // RHS values.  We shouldn't complain that a value we
+                  // don't need is missing from the list.
 
-                    if (! ult.is_black_hole ())
-                      error ("element number %" OCTAVE_IDX_TYPE_FORMAT
-                             " undefined in return list", k+1);
+                  if (! ult.is_black_hole ())
+                    error ("element number %" OCTAVE_IDX_TYPE_FORMAT
+                           " undefined in return list", k+1);
 
-                    k++;
-                    continue;
-                  }
-              }
+                  k++;
+                  continue;
+                }
+            }
 
-            if (print_result () && tw.statement_printing_enabled ())
-              {
-                // We clear any index here so that we can get
-                // the new value of the referenced object below,
-                // instead of the indexed value (which should be
-                // the same as the right hand side value).
+          if (print_result () && tw.statement_printing_enabled ())
+            {
+              // We clear any index here so that we can get
+              // the new value of the referenced object below,
+              // instead of the indexed value (which should be
+              // the same as the right hand side value).
 
-                ult.clear_index ();
+              ult.clear_index ();
 
-                octave_value lhs_val = ult.value ();
+              octave_value lhs_val = ult.value ();
 
-                octave_value_list args = ovl (lhs_val);
-                args.stash_name_tags (string_vector (lhs_elt->name ()));
-                feval ("display", args);
-              }
-          }
+              octave_value_list args = ovl (lhs_val);
+              args.stash_name_tags (string_vector (lhs_elt->name ()));
+              feval ("display", args);
+            }
+        }
 
-        // Concatenate return values.
-        val = retval_list;
-      }
+      // Concatenate return values.
+      val = retval_list;
+    }
 
-    return val;
-  }
+  return val;
+}
 
 OCTAVE_END_NAMESPACE(octave)