Mercurial > octave
comparison libinterp/octave-value/ov-str-mat.h @ 31771:21f9b34eb893
maint: Eliminate "(void)" in C++ function prototypes/declarations.
* mk-opts.pl, external.txi, embedded.cc, make_int.cc, standalone.cc,
standalonebuiltin.cc, BaseControl.cc, BaseControl.h, ButtonControl.cc,
ButtonControl.h, ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h,
CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h,
ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h, Figure.cc,
Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc, GLCanvas.h,
GenericEventNotify.h, KeyMap.cc, ListBoxControl.cc, ListBoxControl.h,
Logger.cc, Logger.h, Menu.cc, Menu.h, MenuContainer.h, Object.cc, Object.h,
ObjectProxy.cc, ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc,
PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h, PushTool.cc,
PushTool.h, RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc,
SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h, TextEdit.h,
ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h,
ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, gl-select.cc,
gl-select.h, qopengl-functions.h, qt-graphics-toolkit.h, qdialog.cpp,
qfontdialog.cpp, qprintdialog_win.cpp, liboctgui-build-info.h,
liboctgui-build-info.in.cc, color-picker.cc, color-picker.h, command-widget.cc,
command-widget.h, community-news.cc, community-news.h, dialog.cc, dialog.h,
documentation-bookmarks.cc, documentation-bookmarks.h,
documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc,
documentation.h, dw-main-window.cc, dw-main-window.h,
external-editor-interface.cc, external-editor-interface.h,
files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc,
find-files-dialog.h, find-files-model.cc, find-files-model.h,
gui-preferences.cc, gui-preferences.h, gui-settings.cc, gui-settings.h,
history-dock-widget.cc, history-dock-widget.h, interpreter-qobject.cc,
interpreter-qobject.h, file-editor-interface.h, file-editor-tab.cc,
file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc,
find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc, octave-qscintilla.h,
octave-txt-lexer.cc, octave-txt-lexer.h, main-window.cc, main-window.h,
news-reader.cc, news-reader.h, octave-dock-widget.cc, octave-dock-widget.h,
octave-qobject.cc, octave-qobject.h, qt-application.cc, qt-application.h,
qt-interpreter-events.cc, qt-interpreter-events.h, release-notes.cc,
release-notes.h, set-path-dialog.cc, set-path-dialog.h, set-path-model.cc,
set-path-model.h, settings-dialog.cc, settings-dialog.h,
shortcuts-tree-widget.cc, shortcuts-tree-widget.h, tab-bar.cc, tab-bar.h,
terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor-model.cc,
variable-editor-model.h, variable-editor.cc, variable-editor.h,
welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h,
workspace-view.cc, workspace-view.h, build-env.h, Cell.cc, Cell.h,
__contourc__.cc, __magick_read__.cc, auto-shlib.cc, auto-shlib.h,
base-text-renderer.h, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h,
call-stack.cc, call-stack.h, debug.cc, defaults.cc, defaults.h, defun.cc,
display.cc, display.h, dynamic-ld.cc, dynamic-ld.h, environment.cc,
environment.h, error.cc, error.h, errwarn.cc, errwarn.h, event-manager.cc,
event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h,
ft-text-renderer.cc, ft-text-renderer.h, genprops.awk, gh-manager.cc,
gh-manager.h, gl-render.cc, gl-render.h, gl2ps-print.cc, graphics-toolkit.h,
graphics.cc, graphics.in.h, gtk-manager.cc, gtk-manager.h, help.cc, help.h,
hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h,
interpreter.cc, interpreter.h, jsondecode.cc, latex-text-renderer.cc,
latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h,
ls-hdf5.cc, ls-hdf5.h, mxarray.h, oct-errno.h, oct-errno.in.cc, oct-fstrm.cc,
oct-fstrm.h, oct-handle.h, oct-hist.cc, oct-hist.h, oct-iostrm.cc,
oct-iostrm.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.cc,
oct-prcstrm.h, oct-procbuf.cc, oct-procbuf.h, oct-process.h, oct-stdstrm.h,
oct-stream.cc, oct-stream.h, oct-strstrm.cc, oct-strstrm.h,
oct-tex-lexer.in.ll, pager.cc, pager.h, pr-flt-fmt.cc, pr-flt-fmt.h,
pr-output.cc, pr-output.h, procstream.cc, procstream.h, settings.cc,
settings.h, sighandlers.cc, sighandlers.h, stack-frame.cc, stack-frame.h,
svd.cc, syminfo.cc, syminfo.h, 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, toplev.cc, url-handle-manager.cc,
url-handle-manager.h, variables.cc, xpow.cc, __init_fltk__.cc,
__init_gnuplot__.cc, __ode15__.cc, audiodevinfo.cc, gzip.cc,
liboctinterp-build-info.h, liboctinterp-build-info.in.cc,
mk-build-env-features.sh, mk-builtins.pl, cdef-class.cc, cdef-class.h,
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-diag.h, ov-base-int.cc,
ov-base-int.h, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc,
ov-base-scalar.h, ov-base-sparse.cc, ov-base-sparse.h, ov-base.cc, ov-base.h,
ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc,
ov-bool.h, ov-builtin.cc, ov-builtin.h, ov-cell.cc, ov-cell.h, ov-ch-mat.cc,
ov-ch-mat.h, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h,
ov-colon.h, ov-complex.cc, ov-complex.h, ov-cs-list.h, ov-cx-diag.cc,
ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc, ov-cx-sparse.h,
ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.cc,
ov-fcn.h, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h,
ov-flt-cx-diag.cc, ov-flt-cx-diag.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h,
ov-flt-re-diag.cc, ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h,
ov-intx.h, ov-java.cc, ov-java.h, ov-lazy-idx.cc, ov-lazy-idx.h,
ov-legacy-range.cc, ov-legacy-range.h, ov-magic-int.cc, ov-magic-int.h,
ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-null-mat.h, ov-oncleanup.cc,
ov-oncleanup.h, ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h, ov-re-diag.cc,
ov-re-diag.h, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h,
ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc,
ov-struct.h, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc,
ov.h, ovl.cc, ovl.h, octave.cc, octave.h, anon-fcn-validator.h, bp-table.cc,
bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, lex.ll,
oct-lvalue.cc, oct-lvalue.h, oct-parse.yy, parse.h, profiler.cc, profiler.h,
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.h, pt-cbinop.h, pt-cell.h, pt-check.h,
pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.h, 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.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.h, pt.cc, pt.h, token.cc, token.h, usage.h, Array-base.cc, Array.h,
CColVector.cc, CColVector.h, CDiagMatrix.cc, CDiagMatrix.h, CMatrix.cc,
CMatrix.h, CNDArray.cc, CNDArray.h, CRowVector.cc, CRowVector.h, CSparse.cc,
CSparse.h, DiagArray2.cc, DiagArray2.h, MArray.cc, MArray.h, MDiagArray2.h,
MSparse.h, MatrixType.cc, MatrixType.h, PermMatrix.cc, PermMatrix.h, Range.cc,
Range.h, Sparse-b.cc, Sparse.cc, Sparse.h, boolMatrix.cc, boolMatrix.h,
boolNDArray.cc, boolNDArray.h, boolSparse.cc, boolSparse.h, chMatrix.h,
chNDArray.h, dColVector.cc, dColVector.h, dDiagMatrix.cc, dDiagMatrix.h,
dMatrix.cc, dMatrix.h, dNDArray.cc, dNDArray.h, dRowVector.cc, dRowVector.h,
dSparse.cc, dSparse.h, dim-vector.cc, dim-vector.h, fCColVector.cc,
fCColVector.h, fCDiagMatrix.cc, fCDiagMatrix.h, fCMatrix.cc, fCMatrix.h,
fCNDArray.cc, fCNDArray.h, fCRowVector.cc, fCRowVector.h, fColVector.cc,
fColVector.h, fDiagMatrix.cc, fDiagMatrix.h, fMatrix.cc, fMatrix.h,
fNDArray.cc, fNDArray.h, fRowVector.cc, fRowVector.h, idx-vector.cc,
idx-vector.h, intNDArray.cc, intNDArray.h, liboctave-build-info.h,
liboctave-build-info.in.cc, CollocWt.cc, CollocWt.h, DAE.h, DAEFunc.h, DAERT.h,
DAERTFunc.h, DASPK.cc, DASPK.h, DASRT.cc, DASRT.h, DASSL.cc, DASSL.h, DET.h,
EIG.h, LSODE.cc, LSODE.h, ODE.h, ODEFunc.h, ODES.h, ODESFunc.h, Quad.h,
aepbalance.cc, aepbalance.h, base-dae.h, base-de.h, chol.cc, chol.h,
eigs-base.cc, fEIG.h, gepbalance.h, gsvd.cc, gsvd.h, hess.h, lu.cc, lu.h,
oct-fftw.cc, oct-fftw.h, oct-rand.cc, oct-rand.h, oct-spparms.cc,
oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randmtzig.cc, randmtzig.h, 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.h, base-list.h, caseless-str.h, cmd-edit.cc, cmd-edit.h,
cmd-hist.cc, cmd-hist.h, data-conv.cc, file-info.h, glob-match.cc,
glob-match.h, kpse.cc, kpse.h, lo-array-errwarn.cc, lo-array-errwarn.h,
lo-hash.cc, lo-hash.h, lo-ieee.cc, lo-ieee.h, lo-regexp.cc, lo-regexp.h,
oct-inttypes.cc, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h,
oct-shlib.cc, oct-shlib.h, oct-sort.cc, oct-sort.h, oct-sparse.cc,
octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc,
singleton-cleanup.cc, singleton-cleanup.h, str-vec.cc, str-vec.h,
unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h, version.cc,
version.in.h, cxx-signal-helpers.cc, acinclude.m4, main-cli.cc, main-gui.cc,
main.in.cc, mkoctfile.in.cc, octave-build-info.h, octave-build-info.in.cc,
octave-config.in.cc, octave-svgconvert.cc, shared-fcns.h:
maint: Eliminate "(void)" in C++ function prototypes/declarations.
author | Rik <rik@octave.org> |
---|---|
date | Tue, 24 Jan 2023 17:19:44 -0800 |
parents | 597f3ee61a48 |
children | ae4e19c0a2b1 2e484f9f1f18 |
comparison
equal
deleted
inserted
replaced
31770:1d1eff97670e | 31771:21f9b34eb893 |
---|---|
52 OCTINTERP_API | 52 OCTINTERP_API |
53 octave_char_matrix_str : public octave_char_matrix | 53 octave_char_matrix_str : public octave_char_matrix |
54 { | 54 { |
55 public: | 55 public: |
56 | 56 |
57 octave_char_matrix_str (void) | 57 octave_char_matrix_str () |
58 : octave_char_matrix () { } | 58 : octave_char_matrix () { } |
59 | 59 |
60 octave_char_matrix_str (const charMatrix& chm) | 60 octave_char_matrix_str (const charMatrix& chm) |
61 : octave_char_matrix (chm) { } | 61 : octave_char_matrix (chm) { } |
62 | 62 |
82 : octave_char_matrix (chm) { } | 82 : octave_char_matrix (chm) { } |
83 | 83 |
84 octave_char_matrix_str (const octave_char_matrix_str& chms) | 84 octave_char_matrix_str (const octave_char_matrix_str& chms) |
85 : octave_char_matrix (chms) { } | 85 : octave_char_matrix (chms) { } |
86 | 86 |
87 ~octave_char_matrix_str (void) = default; | 87 ~octave_char_matrix_str () = default; |
88 | 88 |
89 octave_base_value * clone (void) const | 89 octave_base_value * clone () const |
90 { return new octave_char_matrix_str (*this); } | 90 { return new octave_char_matrix_str (*this); } |
91 octave_base_value * empty_clone (void) const | 91 octave_base_value * empty_clone () const |
92 { return new octave_char_matrix_str (); } | 92 { return new octave_char_matrix_str (); } |
93 | 93 |
94 type_conv_info numeric_conversion_function (void) const; | 94 type_conv_info numeric_conversion_function () const; |
95 | 95 |
96 octave_value do_index_op (const octave_value_list& idx, | 96 octave_value do_index_op (const octave_value_list& idx, |
97 bool resize_ok = false) | 97 bool resize_ok = false) |
98 { return do_index_op_internal (idx, resize_ok); } | 98 { return do_index_op_internal (idx, resize_ok); } |
99 | 99 |
100 octave_value squeeze (void) const | 100 octave_value squeeze () const |
101 { return octave_value (charNDArray (m_matrix.squeeze ())); } | 101 { return octave_value (charNDArray (m_matrix.squeeze ())); } |
102 | 102 |
103 octave_value reshape (const dim_vector& new_dims) const | 103 octave_value reshape (const dim_vector& new_dims) const |
104 { return octave_value (charNDArray (m_matrix.reshape (new_dims))); } | 104 { return octave_value (charNDArray (m_matrix.reshape (new_dims))); } |
105 | 105 |
114 using octave_char_matrix::diag; | 114 using octave_char_matrix::diag; |
115 | 115 |
116 octave_value diag (octave_idx_type k = 0) const | 116 octave_value diag (octave_idx_type k = 0) const |
117 { return octave_value (m_matrix.diag (k)); } | 117 { return octave_value (m_matrix.diag (k)); } |
118 | 118 |
119 bool is_string (void) const { return true; } | 119 bool is_string () const { return true; } |
120 | 120 |
121 bool isnumeric (void) const { return false; } | 121 bool isnumeric () const { return false; } |
122 | 122 |
123 double double_value (bool = false) const; | 123 double double_value (bool = false) const; |
124 | 124 |
125 Matrix matrix_value (bool = false) const; | 125 Matrix matrix_value (bool = false) const; |
126 | 126 |
134 | 134 |
135 string_vector string_vector_value (bool pad = false) const; | 135 string_vector string_vector_value (bool pad = false) const; |
136 | 136 |
137 std::string string_value (bool force = false) const; | 137 std::string string_value (bool force = false) const; |
138 | 138 |
139 std::string xstring_value (void) const { return string_value (); } | 139 std::string xstring_value () const { return string_value (); } |
140 | 140 |
141 Array<std::string> cellstr_value (void) const; | 141 Array<std::string> cellstr_value () const; |
142 | 142 |
143 octave_value sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const | 143 octave_value sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const |
144 { return octave_value (m_matrix.sort (dim, mode)); } | 144 { return octave_value (m_matrix.sort (dim, mode)); } |
145 | 145 |
146 octave_value sort (Array<octave_idx_type>& sidx, octave_idx_type dim = 0, | 146 octave_value sort (Array<octave_idx_type>& sidx, octave_idx_type dim = 0, |
147 sortmode mode = ASCENDING) const | 147 sortmode mode = ASCENDING) const |
148 { return octave_value (m_matrix.sort (sidx, dim, mode)); } | 148 { return octave_value (m_matrix.sort (sidx, dim, mode)); } |
149 | 149 |
150 bool print_as_scalar (void) const { return (rows () <= 1); } | 150 bool print_as_scalar () const { return (rows () <= 1); } |
151 | 151 |
152 void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; | 152 void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; |
153 | 153 |
154 void short_disp (std::ostream& os) const; | 154 void short_disp (std::ostream& os) const; |
155 | 155 |
189 class | 189 class |
190 octave_char_matrix_sq_str : public octave_char_matrix_str | 190 octave_char_matrix_sq_str : public octave_char_matrix_str |
191 { | 191 { |
192 public: | 192 public: |
193 | 193 |
194 octave_char_matrix_sq_str (void) | 194 octave_char_matrix_sq_str () |
195 : octave_char_matrix_str () { } | 195 : octave_char_matrix_str () { } |
196 | 196 |
197 octave_char_matrix_sq_str (const charMatrix& chm) | 197 octave_char_matrix_sq_str (const charMatrix& chm) |
198 : octave_char_matrix_str (chm) { } | 198 : octave_char_matrix_str (chm) { } |
199 | 199 |
219 : octave_char_matrix_str (chm) { } | 219 : octave_char_matrix_str (chm) { } |
220 | 220 |
221 octave_char_matrix_sq_str (const octave_char_matrix_sq_str& chms) | 221 octave_char_matrix_sq_str (const octave_char_matrix_sq_str& chms) |
222 : octave_char_matrix_str (chms) { } | 222 : octave_char_matrix_str (chms) { } |
223 | 223 |
224 ~octave_char_matrix_sq_str (void) = default; | 224 ~octave_char_matrix_sq_str () = default; |
225 | 225 |
226 octave_base_value * clone (void) const | 226 octave_base_value * clone () const |
227 { return new octave_char_matrix_sq_str (*this); } | 227 { return new octave_char_matrix_sq_str (*this); } |
228 octave_base_value * empty_clone (void) const | 228 octave_base_value * empty_clone () const |
229 { return new octave_char_matrix_sq_str (); } | 229 { return new octave_char_matrix_sq_str (); } |
230 | 230 |
231 octave_value squeeze (void) const | 231 octave_value squeeze () const |
232 { return octave_value (charNDArray (m_matrix.squeeze ()), '\''); } | 232 { return octave_value (charNDArray (m_matrix.squeeze ()), '\''); } |
233 | 233 |
234 octave_value reshape (const dim_vector& new_dims) const | 234 octave_value reshape (const dim_vector& new_dims) const |
235 { return octave_value (charNDArray (m_matrix.reshape (new_dims)), '\''); } | 235 { return octave_value (charNDArray (m_matrix.reshape (new_dims)), '\''); } |
236 | 236 |
250 using octave_char_matrix_str::diag; | 250 using octave_char_matrix_str::diag; |
251 | 251 |
252 octave_value diag (octave_idx_type k = 0) const | 252 octave_value diag (octave_idx_type k = 0) const |
253 { return octave_value (m_matrix.diag (k), '\''); } | 253 { return octave_value (m_matrix.diag (k), '\''); } |
254 | 254 |
255 bool is_sq_string (void) const { return true; } | 255 bool is_sq_string () const { return true; } |
256 | 256 |
257 octave_value do_index_op (const octave_value_list& idx, | 257 octave_value do_index_op (const octave_value_list& idx, |
258 bool resize_ok = false) | 258 bool resize_ok = false) |
259 { return do_index_op_internal (idx, resize_ok, '\''); } | 259 { return do_index_op_internal (idx, resize_ok, '\''); } |
260 | 260 |