Mercurial > octave

comparison libinterp/corefcn/load-path.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 e31eae72aecd
children febd82d1a8de
comparison
equal deleted inserted replaced
31770:1d1eff97670e 31771:21f9b34eb893
53 53
54 load_path (const load_path&) = delete; 54 load_path (const load_path&) = delete;
55 55
56 load_path& operator = (const load_path&) = delete; 56 load_path& operator = (const load_path&) = delete;
57 57
58 ~load_path (void) = default; 58 ~load_path () = default;
59 59
60 void initialize (bool set_initial_path = false); 60 void initialize (bool set_initial_path = false);
61 61
62 void clear (void); 62 void clear ();
63 63
64 void set (const std::string& p, bool warn = false, bool is_init = false); 64 void set (const std::string& p, bool warn = false, bool is_init = false);
65 65
66 void append (const std::string& dir, bool warn = false); 66 void append (const std::string& dir, bool warn = false);
67 67
68 void prepend (const std::string& dir, bool warn = false); 68 void prepend (const std::string& dir, bool warn = false);
69 69
70 bool remove (const std::string& dir); 70 bool remove (const std::string& dir);
71 71
72 void update (void); 72 void update ();
73 73
74 bool contains_canonical (const std::string& dir_name) const; 74 bool contains_canonical (const std::string& dir_name) const;
75 75
76 bool contains_file_in_dir (const std::string& file_name, 76 bool contains_file_in_dir (const std::string& file_name,
77 const std::string& dir_name); 77 const std::string& dir_name);
157 157
158 std::string find_first_of (const string_vector& files) const; 158 std::string find_first_of (const string_vector& files) const;
159 159
160 string_vector find_all_first_of (const string_vector& files) const; 160 string_vector find_all_first_of (const string_vector& files) const;
161 161
162 string_vector dirs (void) const; 162 string_vector dirs () const;
163 163
164 std::list<std::string> dir_list (void) const; 164 std::list<std::string> dir_list () const;
165 165
166 string_vector files (const std::string& dir, bool omit_exts = false) const; 166 string_vector files (const std::string& dir, bool omit_exts = false) const;
167 167
168 string_vector fcn_names (void) const; 168 string_vector fcn_names () const;
169 169
170 std::string path (void) const; 170 std::string path () const;
171 171
172 void display (std::ostream& os) const; 172 void display (std::ostream& os) const;
173 173
174 std::function<void (const std::string&)> get_add_hook (void) 174 std::function<void (const std::string&)> get_add_hook ()
175 { 175 {
176 return add_hook; 176 return add_hook;
177 } 177 }
178 178
179 std::function<void (const std::string&)> get_remove_hook (void) 179 std::function<void (const std::string&)> get_remove_hook ()
180 { 180 {
181 return remove_hook; 181 return remove_hook;
182 } 182 }
183 183
184 void set_add_hook (const std::function<void (const std::string&)>& f) 184 void set_add_hook (const std::function<void (const std::string&)>& f)
202 m_command_line_path = p; 202 m_command_line_path = p;
203 else 203 else
204 m_command_line_path += directory_path::path_sep_str () + p; 204 m_command_line_path += directory_path::path_sep_str () + p;
205 } 205 }
206 206
207 std::string get_command_line_path (void) const 207 std::string get_command_line_path () const
208 { 208 {
209 return m_command_line_path; 209 return m_command_line_path;
210 } 210 }
211 211
212 std::string system_path (void) const { return s_sys_path; } 212 std::string system_path () const { return s_sys_path; }
213 213
214 void rehash (void); 214 void rehash ();
215 215
216 static const int M_FILE = 1; 216 static const int M_FILE = 1;
217 static const int OCT_FILE = 2; 217 static const int OCT_FILE = 2;
218 static const int MEX_FILE = 4; 218 static const int MEX_FILE = 4;
219 219
230 typedef fcn_file_map_type::iterator fcn_file_map_iterator; 230 typedef fcn_file_map_type::iterator fcn_file_map_iterator;
231 231
232 struct class_info 232 struct class_info
233 { 233 {
234 public: 234 public:
235 class_info (void) : method_file_map (), private_file_map () { } 235 class_info () : method_file_map (), private_file_map () { }
236 236
237 class_info (const class_info& ci) 237 class_info (const class_info& ci)
238 : method_file_map (ci.method_file_map), 238 : method_file_map (ci.method_file_map),
239 private_file_map (ci.private_file_map) 239 private_file_map (ci.private_file_map)
240 { } 240 { }
247 private_file_map = ci.private_file_map; 247 private_file_map = ci.private_file_map;
248 } 248 }
249 return *this; 249 return *this;
250 } 250 }
251 251
252 ~class_info (void) = default; 252 ~class_info () = default;
253 253
254 fcn_file_map_type method_file_map; 254 fcn_file_map_type method_file_map;
255 fcn_file_map_type private_file_map; 255 fcn_file_map_type private_file_map;
256 }; 256 };
257 257
268 typedef package_dir_map_type::iterator package_dir_map_iterator; 268 typedef package_dir_map_type::iterator package_dir_map_iterator;
269 269
270 // This default constructor is only provided so we can create a 270 // This default constructor is only provided so we can create a
271 // std::map of dir_info objects. You should not use this 271 // std::map of dir_info objects. You should not use this
272 // constructor for any other purpose. 272 // constructor for any other purpose.
273 dir_info (void) = default; 273 dir_info () = default;
274 274
275 dir_info (const std::string& d) 275 dir_info (const std::string& d)
276 : dir_name (d), abs_dir_name (), is_relative (false), 276 : dir_name (d), abs_dir_name (), is_relative (false),
277 dir_mtime (), dir_time_last_checked (), all_files (), fcn_files (), 277 dir_mtime (), dir_time_last_checked (), all_files (), fcn_files (),
278 private_file_map (), method_file_map (), package_dir_map () 278 private_file_map (), method_file_map (), package_dir_map ()
280 initialize (); 280 initialize ();
281 } 281 }
282 282
283 dir_info (const dir_info&) = default; 283 dir_info (const dir_info&) = default;
284 284
285 ~dir_info (void) = default; 285 ~dir_info () = default;
286 286
287 dir_info& operator = (const dir_info&) = default; 287 dir_info& operator = (const dir_info&) = default;
288 288
289 bool update (void); 289 bool update ();
290 290
291 std::string dir_name; 291 std::string dir_name;
292 std::string abs_dir_name; 292 std::string abs_dir_name;
293 bool is_relative; 293 bool is_relative;
294 sys::time dir_mtime; 294 sys::time dir_mtime;
301 301
302 bool is_package (const std::string& name) const; 302 bool is_package (const std::string& name) const;
303 303
304 private: 304 private:
305 305
306 void initialize (void); 306 void initialize ();
307 307
308 void get_file_list (const std::string& d); 308 void get_file_list (const std::string& d);
309 309
310 void get_private_file_map (const std::string& d); 310 void get_private_file_map (const std::string& d);
311 311
325 file_info (const std::string& d, int t) : dir_name (d), types (t) { } 325 file_info (const std::string& d, int t) : dir_name (d), types (t) { }
326 326
327 file_info (const file_info& fi) 327 file_info (const file_info& fi)
328 : dir_name (fi.dir_name), types (fi.types) { } 328 : dir_name (fi.dir_name), types (fi.types) { }
329 329
330 ~file_info (void) = default; 330 ~file_info () = default;
331 331
332 file_info& operator = (const file_info& fi) 332 file_info& operator = (const file_info& fi)
333 { 333 {
334 if (&fi != this) 334 if (&fi != this)
335 { 335 {
404 package_info (const package_info& l) 404 package_info (const package_info& l)
405 : m_package_name (l.m_package_name), m_dir_list (l.m_dir_list), 405 : m_package_name (l.m_package_name), m_dir_list (l.m_dir_list),
406 m_private_fcn_map (l.m_private_fcn_map), m_method_map (l.m_method_map) 406 m_private_fcn_map (l.m_private_fcn_map), m_method_map (l.m_method_map)
407 { } 407 { }
408 408
409 ~package_info (void) = default; 409 ~package_info () = default;
410 410
411 package_info& operator = (const package_info& l) 411 package_info& operator = (const package_info& l)
412 { 412 {
413 if (&l != this) 413 if (&l != this)
414 { 414 {
438 438
439 void move (const dir_info& di, bool at_end); 439 void move (const dir_info& di, bool at_end);
440 440
441 void remove (const dir_info& di); 441 void remove (const dir_info& di);
442 442
443 void clear (void) 443 void clear ()
444 { 444 {
445 m_dir_list.clear (); 445 m_dir_list.clear ();
446 446
447 m_fcn_map.clear (); 447 m_fcn_map.clear ();
448 448
468 468
469 std::list<std::string> methods (const std::string& class_name) const; 469 std::list<std::string> methods (const std::string& class_name) const;
470 470
471 void overloads (const std::string& meth, std::list<std::string>& l) const; 471 void overloads (const std::string& meth, std::list<std::string>& l) const;
472 472
473 string_vector fcn_names (void) const; 473 string_vector fcn_names () const;
474 474
475 private: 475 private:
476 476
477 void add_to_fcn_map (const dir_info& di, bool at_end, bool updating); 477 void add_to_fcn_map (const dir_info& di, bool at_end, bool updating);
478 478