diff libinterp/parse-tree/pt-tm-const.h @ 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-tm-const.h	Thu Dec 01 14:23:45 2022 -0800
+++ b/libinterp/parse-tree/pt-tm-const.h	Thu Dec 01 18:02:15 2022 -0800
@@ -45,200 +45,200 @@
 
 OCTAVE_BEGIN_NAMESPACE(octave)
 
-  class tree_evaluator;
+class tree_evaluator;
 
-  // Evaluate tree_matrix objects and convert them to octave_value
-  // arrays (full and sparse numeric, char, cell, struct, class and
-  // anything else that works like an array).  Use a separate class
-  // (tm_const) and pass the evaluator object to it instead of doing
-  // all this work in tree_evaluator::visit_matrix because the job is
-  // fairly large and requires extra data (stored in the tm_info
-  // class) for each row and for the overall array.
+// Evaluate tree_matrix objects and convert them to octave_value
+// arrays (full and sparse numeric, char, cell, struct, class and
+// anything else that works like an array).  Use a separate class
+// (tm_const) and pass the evaluator object to it instead of doing
+// all this work in tree_evaluator::visit_matrix because the job is
+// fairly large and requires extra data (stored in the tm_info
+// class) for each row and for the overall array.
 
-  // Evaluate all elements of the array, recording info about each
-  // row, then create summary info for the full array.  Compute the
-  // result type and dimension first before copying values.
+// Evaluate all elements of the array, recording info about each
+// row, then create summary info for the full array.  Compute the
+// result type and dimension first before copying values.
 
-  // FIXME: Handle overloading of horzcat and vertcat for for built-in
-  // types.
+// FIXME: Handle overloading of horzcat and vertcat for for built-in
+// types.
 
-  // Summary info about the current row or matrix.
+// Summary info about the current row or matrix.
 
-  class tm_info
-  {
-  public:
+class tm_info
+{
+public:
 
-    tm_info (bool obj_is_empty)
-      : m_dv (0, 0), m_all_strings (true), m_all_sq_strings (true),
-        m_all_dq_strings (true), m_some_strings (false),
-        m_all_real (true), m_all_complex (true), m_all_empty (true),
-        m_any_cell (false), m_any_sparse (false),
-        m_any_class (false), m_all_1x1 (! obj_is_empty),
-        m_first_elem_is_struct (false), m_class_name ()
-    { }
+  tm_info (bool obj_is_empty)
+    : m_dv (0, 0), m_all_strings (true), m_all_sq_strings (true),
+      m_all_dq_strings (true), m_some_strings (false),
+      m_all_real (true), m_all_complex (true), m_all_empty (true),
+      m_any_cell (false), m_any_sparse (false),
+      m_any_class (false), m_all_1x1 (! obj_is_empty),
+      m_first_elem_is_struct (false), m_class_name ()
+  { }
 
-    dim_vector dims (void) const { return m_dv; }
+  dim_vector dims (void) const { return m_dv; }
 
-    octave_idx_type rows (void) const { return m_dv(0); }
-    octave_idx_type cols (void) const { return m_dv(1); }
+  octave_idx_type rows (void) const { return m_dv(0); }
+  octave_idx_type cols (void) const { return m_dv(1); }
 
-    bool all_strings_p (void) const { return m_all_strings; }
-    bool all_sq_strings_p (void) const { return m_all_sq_strings; }
-    bool all_dq_strings_p (void) const { return m_all_dq_strings; }
-    bool some_strings_p (void) const { return m_some_strings; }
-    bool all_real_p (void) const { return m_all_real; }
-    bool all_complex_p (void) const { return m_all_complex; }
-    bool all_empty_p (void) const { return m_all_empty; }
-    bool any_cell_p (void) const { return m_any_cell; }
-    bool any_sparse_p (void) const { return m_any_sparse; }
-    bool any_class_p (void) const { return m_any_class; }
-    bool all_1x1_p (void) const { return m_all_1x1; }
-    bool first_elem_struct_p (void) const { return m_first_elem_is_struct; }
+  bool all_strings_p (void) const { return m_all_strings; }
+  bool all_sq_strings_p (void) const { return m_all_sq_strings; }
+  bool all_dq_strings_p (void) const { return m_all_dq_strings; }
+  bool some_strings_p (void) const { return m_some_strings; }
+  bool all_real_p (void) const { return m_all_real; }
+  bool all_complex_p (void) const { return m_all_complex; }
+  bool all_empty_p (void) const { return m_all_empty; }
+  bool any_cell_p (void) const { return m_any_cell; }
+  bool any_sparse_p (void) const { return m_any_sparse; }
+  bool any_class_p (void) const { return m_any_class; }
+  bool all_1x1_p (void) const { return m_all_1x1; }
+  bool first_elem_struct_p (void) const { return m_first_elem_is_struct; }
 
-    std::string class_name (void) const { return m_class_name; }
+  std::string class_name (void) const { return m_class_name; }
 
-  protected:
+protected:
 
-    // Size of this row or matrix after evaluation.
-    dim_vector m_dv;
+  // Size of this row or matrix after evaluation.
+  dim_vector m_dv;
 
-    // Are all elements character strings?
-    bool m_all_strings;
+  // Are all elements character strings?
+  bool m_all_strings;
 
-    // Are all elements double-quoted character strings?
-    bool m_all_sq_strings;
+  // Are all elements double-quoted character strings?
+  bool m_all_sq_strings;
 
-    // Are all elements single-quoted character strings?
-    bool m_all_dq_strings;
+  // Are all elements single-quoted character strings?
+  bool m_all_dq_strings;
 
-    // Are any elements character strings?
-    bool m_some_strings;
+  // Are any elements character strings?
+  bool m_some_strings;
 
-    // Are all elements real valued?
-    bool m_all_real;
+  // Are all elements real valued?
+  bool m_all_real;
 
-    // Are all elements complex valued?
-    bool m_all_complex;
+  // Are all elements complex valued?
+  bool m_all_complex;
 
-    // Are all elements empty?
-    bool m_all_empty;
+  // Are all elements empty?
+  bool m_all_empty;
 
-    // Are any elements cells?
-    bool m_any_cell;
+  // Are any elements cells?
+  bool m_any_cell;
 
-    // Are any elements sparse arrays?
-    bool m_any_sparse;
+  // Are any elements sparse arrays?
+  bool m_any_sparse;
 
-    // Are any elements sparse class objects?
-    bool m_any_class;
+  // Are any elements sparse class objects?
+  bool m_any_class;
 
-    // Do all elements have dimensions 1x1?
-    bool m_all_1x1;
+  // Do all elements have dimensions 1x1?
+  bool m_all_1x1;
 
-    // Is the first element a struct?
-    bool m_first_elem_is_struct;
+  // Is the first element a struct?
+  bool m_first_elem_is_struct;
 
-    // Class name of result.
-    std::string m_class_name;
-  };
+  // Class name of result.
+  std::string m_class_name;
+};
 
-  class tm_row_const : public tm_info
-  {
-  public:
+class tm_row_const : public tm_info
+{
+public:
 
-    typedef std::list<octave_value>::iterator iterator;
-    typedef std::list<octave_value>::const_iterator const_iterator;
+  typedef std::list<octave_value>::iterator iterator;
+  typedef std::list<octave_value>::const_iterator const_iterator;
 
-    tm_row_const (void) = delete;
+  tm_row_const (void) = delete;
 
-    tm_row_const (const tree_argument_list& row, tree_evaluator& tw)
-      : tm_info (row.empty ()), m_values ()
-    {
-      init (row, tw);
-    }
+  tm_row_const (const tree_argument_list& row, tree_evaluator& tw)
+    : tm_info (row.empty ()), m_values ()
+  {
+    init (row, tw);
+  }
 
-    tm_row_const (const tm_row_const&) = default;
+  tm_row_const (const tm_row_const&) = default;
 
-    tm_row_const& operator = (const tm_row_const&) = delete;
+  tm_row_const& operator = (const tm_row_const&) = delete;
 
-    ~tm_row_const (void) = default;
+  ~tm_row_const (void) = default;
 
-    iterator begin (void) { return m_values.begin (); }
-    const_iterator begin (void) const { return m_values.begin (); }
+  iterator begin (void) { return m_values.begin (); }
+  const_iterator begin (void) const { return m_values.begin (); }
 
-    iterator end (void) { return m_values.end (); }
-    const_iterator end (void) const { return m_values.end (); }
+  iterator end (void) { return m_values.end (); }
+  const_iterator end (void) const { return m_values.end (); }
 
-    bool empty (void) const { return m_values.empty (); }
+  bool empty (void) const { return m_values.empty (); }
 
-    std::size_t length (void) const { return m_values.size (); }
+  std::size_t length (void) const { return m_values.size (); }
 
-    void cellify (void);
+  void cellify (void);
 
-  private:
+private:
 
-    std::list<octave_value> m_values;
+  std::list<octave_value> m_values;
 
-    void init_element (const octave_value&, bool&);
+  void init_element (const octave_value&, bool&);
 
-    void init (const tree_argument_list&, tree_evaluator& tw);
-  };
+  void init (const tree_argument_list&, tree_evaluator& tw);
+};
 
-  class tm_const : public tm_info
-  {
-  public:
+class tm_const : public tm_info
+{
+public:
 
-    typedef std::list<tm_row_const>::iterator iterator;
-    typedef std::list<tm_row_const>::const_iterator const_iterator;
+  typedef std::list<tm_row_const>::iterator iterator;
+  typedef std::list<tm_row_const>::const_iterator const_iterator;
 
-    tm_const (void) = delete;
+  tm_const (void) = delete;
 
-    tm_const (const tree_matrix& tm, tree_evaluator& tw)
-      : tm_info (tm.empty ()), m_evaluator (tw), m_tm_rows ()
-    {
-      init (tm);
-    }
+  tm_const (const tree_matrix& tm, tree_evaluator& tw)
+    : tm_info (tm.empty ()), m_evaluator (tw), m_tm_rows ()
+  {
+    init (tm);
+  }
 
-    // No copying!
+  // No copying!
 
-    tm_const (const tm_const&) = delete;
+  tm_const (const tm_const&) = delete;
 
-    tm_const& operator = (const tm_const&) = delete;
+  tm_const& operator = (const tm_const&) = delete;
 
-    ~tm_const (void) = default;
+  ~tm_const (void) = default;
 
-    octave_value concat (char string_fill_char) const;
+  octave_value concat (char string_fill_char) const;
 
-  private:
+private:
 
-    tree_evaluator& m_evaluator;
+  tree_evaluator& m_evaluator;
 
-    // The list of lists of octave_value objects that contain the
-    // values of elements in each row of the tree_matrix object we are
-    // evaluating.
+  // The list of lists of octave_value objects that contain the
+  // values of elements in each row of the tree_matrix object we are
+  // evaluating.
 
-    std::list<tm_row_const> m_tm_rows;
+  std::list<tm_row_const> m_tm_rows;
 
-    void init (const tree_matrix& tm);
+  void init (const tree_matrix& tm);
 
-    octave_value char_array_concat (char string_fill_char) const;
+  octave_value char_array_concat (char string_fill_char) const;
 
-    octave_value class_concat (void) const;
+  octave_value class_concat (void) const;
 
-    octave_value generic_concat (void) const;
+  octave_value generic_concat (void) const;
 
-    template <typename TYPE>
-    void array_concat_internal (TYPE& result) const;
+  template <typename TYPE>
+  void array_concat_internal (TYPE& result) const;
 
-    template <typename TYPE>
-    TYPE array_concat (void) const;
+  template <typename TYPE>
+  TYPE array_concat (void) const;
 
-    template <typename TYPE>
-    TYPE sparse_array_concat (void) const;
+  template <typename TYPE>
+  TYPE sparse_array_concat (void) const;
 
-    template <typename MAP>
-    octave_map map_concat (void) const;
-  };
+  template <typename MAP>
+  octave_map map_concat (void) const;
+};
 
 OCTAVE_END_NAMESPACE(octave)