Mercurial > octave

comparison libinterp/corefcn/input.h @ 31771:21f9b34eb893

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 1daf8bfceac3
comparison
equal deleted inserted replaced
31770:1d1eff97670e 31771:21f9b34eb893
64 64
65 void initialize (bool line_editing); 65 void initialize (bool line_editing);
66 66
67 octave_value PS1 (const octave_value_list& args, int nargout); 67 octave_value PS1 (const octave_value_list& args, int nargout);
68 68
69 std::string PS1 (void) const { return m_PS1; } 69 std::string PS1 () const { return m_PS1; }
70 70
71 std::string PS1 (const std::string& s) 71 std::string PS1 (const std::string& s)
72 { 72 {
73 std::string val = m_PS1; 73 std::string val = m_PS1;
74 m_PS1 = s; 74 m_PS1 = s;
77 77
78 void set_PS1 (const std::string& s) { m_PS1 = s; } 78 void set_PS1 (const std::string& s) { m_PS1 = s; }
79 79
80 octave_value PS2 (const octave_value_list& args, int nargout); 80 octave_value PS2 (const octave_value_list& args, int nargout);
81 81
82 std::string PS2 (void) const { return m_PS2; } 82 std::string PS2 () const { return m_PS2; }
83 83
84 std::string PS2 (const std::string& s) 84 std::string PS2 (const std::string& s)
85 { 85 {
86 std::string val = m_PS2; 86 std::string val = m_PS2;
87 m_PS2 = s; 87 m_PS2 = s;
88 return val; 88 return val;
89 } 89 }
90 90
91 void set_PS2 (const std::string& s) { m_PS2 = s; } 91 void set_PS2 (const std::string& s) { m_PS2 = s; }
92 92
93 std::string last_debugging_command (void) const 93 std::string last_debugging_command () const
94 { 94 {
95 return m_last_debugging_command; 95 return m_last_debugging_command;
96 } 96 }
97 97
98 std::string last_debugging_command (const std::string& s) 98 std::string last_debugging_command (const std::string& s)
103 } 103 }
104 104
105 octave_value 105 octave_value
106 completion_append_char (const octave_value_list& args, int nargout); 106 completion_append_char (const octave_value_list& args, int nargout);
107 107
108 char completion_append_char (void) const 108 char completion_append_char () const
109 { 109 {
110 return m_completion_append_char; 110 return m_completion_append_char;
111 } 111 }
112 112
113 char completion_append_char (char c) 113 char completion_append_char (char c)
119 119
120 void set_completion_append_char (char c) { m_completion_append_char = c; } 120 void set_completion_append_char (char c) { m_completion_append_char = c; }
121 121
122 octave_value gud_mode (const octave_value_list& args, int nargout); 122 octave_value gud_mode (const octave_value_list& args, int nargout);
123 123
124 bool gud_mode (void) const { return m_gud_mode; } 124 bool gud_mode () const { return m_gud_mode; }
125 125
126 bool gud_mode (bool flag) 126 bool gud_mode (bool flag)
127 { 127 {
128 bool val = m_gud_mode; 128 bool val = m_gud_mode;
129 m_gud_mode = flag; 129 m_gud_mode = flag;
132 132
133 void set_gud_mode (bool flag) { m_gud_mode = flag; } 133 void set_gud_mode (bool flag) { m_gud_mode = flag; }
134 134
135 octave_value mfile_encoding (const octave_value_list& args, int nargout); 135 octave_value mfile_encoding (const octave_value_list& args, int nargout);
136 136
137 std::string mfile_encoding (void) const { return m_mfile_encoding; } 137 std::string mfile_encoding () const { return m_mfile_encoding; }
138 138
139 std::string mfile_encoding (const std::string& s) 139 std::string mfile_encoding (const std::string& s)
140 { 140 {
141 std::string val = m_mfile_encoding; 141 std::string val = m_mfile_encoding;
142 m_mfile_encoding = s; 142 m_mfile_encoding = s;
150 void set_dir_encoding (const std::string& dir, std::string& enc); 150 void set_dir_encoding (const std::string& dir, std::string& enc);
151 151
152 octave_value 152 octave_value
153 auto_repeat_debug_command (const octave_value_list& args, int nargout); 153 auto_repeat_debug_command (const octave_value_list& args, int nargout);
154 154
155 bool auto_repeat_debug_command (void) const 155 bool auto_repeat_debug_command () const
156 { 156 {
157 return m_auto_repeat_debug_command; 157 return m_auto_repeat_debug_command;
158 } 158 }
159 159
160 bool auto_repeat_debug_command (bool val) 160 bool auto_repeat_debug_command (bool val)
169 std::string interactive_input (const std::string& s, bool& eof); 169 std::string interactive_input (const std::string& s, bool& eof);
170 170
171 octave_value_list 171 octave_value_list
172 get_user_input (const octave_value_list& args, int nargout); 172 get_user_input (const octave_value_list& args, int nargout);
173 173
174 bool have_input_event_hooks (void) const; 174 bool have_input_event_hooks () const;
175 175
176 void add_input_event_hook (const hook_function& hook_fcn); 176 void add_input_event_hook (const hook_function& hook_fcn);
177 177
178 bool remove_input_event_hook (const std::string& hook_fcn_id); 178 bool remove_input_event_hook (const std::string& hook_fcn_id);
179 179
180 void clear_input_event_hooks (void); 180 void clear_input_event_hooks ();
181 181
182 void run_input_event_hooks (void); 182 void run_input_event_hooks ();
183 183
184 private: 184 private:
185 185
186 interpreter& m_interpreter; 186 interpreter& m_interpreter;
187 187
231 231
232 base_reader (const base_reader& x) 232 base_reader (const base_reader& x)
233 : m_interpreter (x.m_interpreter) 233 : m_interpreter (x.m_interpreter)
234 { } 234 { }
235 235
236 virtual ~base_reader (void) = default; 236 virtual ~base_reader () = default;
237 237
238 virtual std::string get_input (const std::string& prompt, bool& eof) = 0; 238 virtual std::string get_input (const std::string& prompt, bool& eof) = 0;
239 239
240 virtual std::string input_source (void) const { return s_in_src; } 240 virtual std::string input_source () const { return s_in_src; }
241 241
242 std::string octave_gets (const std::string& prompt, bool& eof); 242 std::string octave_gets (const std::string& prompt, bool& eof);
243 243
244 virtual bool input_from_terminal (void) const { return false; } 244 virtual bool input_from_terminal () const { return false; }
245 245
246 virtual bool input_from_file (void) const { return false; } 246 virtual bool input_from_file () const { return false; }
247 247
248 virtual bool input_from_eval_string (void) const { return false; } 248 virtual bool input_from_eval_string () const { return false; }
249 249
250 protected: 250 protected:
251 251
252 interpreter& m_interpreter; 252 interpreter& m_interpreter;
253 253
270 270
271 input_reader (const input_reader& ir) = default; 271 input_reader (const input_reader& ir) = default;
272 272
273 input_reader& operator = (const input_reader& ir) = default; 273 input_reader& operator = (const input_reader& ir) = default;
274 274
275 ~input_reader (void) = default; 275 ~input_reader () = default;
276 276
277 std::string get_input (const std::string& prompt, bool& eof) 277 std::string get_input (const std::string& prompt, bool& eof)
278 { 278 {
279 return m_rep->get_input (prompt, eof); 279 return m_rep->get_input (prompt, eof);
280 } 280 }
281 281
282 std::string input_source (void) const 282 std::string input_source () const
283 { 283 {
284 return m_rep->input_source (); 284 return m_rep->input_source ();
285 } 285 }
286 286
287 bool input_from_terminal (void) const 287 bool input_from_terminal () const
288 { 288 {
289 return m_rep->input_from_terminal (); 289 return m_rep->input_from_terminal ();
290 } 290 }
291 291
292 bool input_from_file (void) const 292 bool input_from_file () const
293 { 293 {
294 return m_rep->input_from_file (); 294 return m_rep->input_from_file ();
295 } 295 }
296 296
297 bool input_from_eval_string (void) const 297 bool input_from_eval_string () const
298 { 298 {
299 return m_rep->input_from_eval_string (); 299 return m_rep->input_from_eval_string ();
300 } 300 }
301 301
302 private: 302 private: