Mercurial > octave
diff libinterp/corefcn/load-path.cc @ 29961:7d6709900da7
eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
Files affected: __betainc__.cc, __contourc__.cc, __eigs__.cc,
__expint__.cc, __ftp__.cc, __gammainc__.cc, __ichol__.cc, __ilu__.cc,
__magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, amd.cc, balance.cc,
besselj.cc, bsxfun.cc, call-stack.cc, ccolamd.cc, cellfun.cc, chol.cc,
colamd.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
defaults.cc, dirfns.cc, display.cc, dlmread.cc, dmperm.cc, dot.cc,
eig.cc, ellipj.cc, environment.cc, error.cc, event-manager.cc, fft.cc,
fft2.cc, fftn.cc, file-io.cc, find.cc, gcd.cc, getgrent.cc,
getpwent.cc, getrusage.cc, gsvd.cc, hash.cc, help.cc, hess.cc,
hex2num.cc, input.cc, inv.cc, jsondecode.cc, jsonencode.cc,
load-path.cc, load-save.cc, lookup.cc, lsode.cc, lu.cc, max.cc,
mgorth.cc, oct-hist.cc, ordqz.cc, ordschur.cc, pager.cc, pr-output.cc,
psi.cc, qr.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, regexp.cc,
schur.cc, settings.cc, sighandlers.cc, sparse.cc, spparms.cc,
sqrtm.cc, stream-euler.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc,
symbfact.cc, symtab.cc, syscalls.cc, sysdep.cc, time.cc, toplev.cc,
tril.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc,
__delaunayn__.cc, __fltk_uigetfile__.cc, __glpk__.cc,
__init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audiodevinfo.cc,
audioread.cc, convhulln.cc, fftw.cc, gzip.cc, ov-cell.cc, ov-class.cc,
ov-classdef.cc, ov-fcn-handle.cc, ov-struct.cc, ov-typeinfo.cc,
ov-usr-fcn.cc, octave.cc, lex.ll, oct-parse.yy, profiler.cc,
andpt-eval.cc.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 14 Aug 2021 22:48:52 -0400 |
| parents | 939bef0b66e0 |
| children | 45c45295a84a |
line wrap: on
line diff
--- a/libinterp/corefcn/load-path.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/load-path.cc Sat Aug 14 22:48:52 2021 -0400 @@ -2426,7 +2426,7 @@ { std::string dirname = args(0).xstring_value ("genpath: DIR must be a string"); - retval = octave::genpath (dirname); + retval = genpath (dirname); } else { @@ -2437,7 +2437,7 @@ for (octave_idx_type i = 1; i < nargin; i++) skip[i-1] = args(i).xstring_value ("genpath: all arguments must be strings"); - retval = octave::genpath (dirname, skip); + retval = genpath (dirname, skip); } return retval; @@ -2449,7 +2449,7 @@ Reinitialize Octave's load path directory cache. @end deftypefn */) { - octave::rehash_internal (); + rehash_internal (); return ovl (); } @@ -2465,7 +2465,7 @@ if (! args.empty ()) print_usage (); - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); return ovl (lp.get_command_line_path ()); } @@ -2481,7 +2481,7 @@ if (! args.empty ()) print_usage (); - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); lp.initialize (true); @@ -2499,7 +2499,7 @@ Undocumented internal function. @end deftypefn */) { - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); return ovl (lp.system_path ()); } @@ -2529,18 +2529,18 @@ string_vector argv = args.make_argv ("path"); - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); if (nargin > 0) { std::string path = argv[1]; for (int i = 2; i <= nargin; i++) - path += octave::directory_path::path_sep_str () + argv[i]; + path += directory_path::path_sep_str () + argv[i]; lp.set (path, true); - octave::rehash_internal (); + rehash_internal (); } if (nargout > 0) @@ -2599,7 +2599,7 @@ if (nargin == 0) print_usage (); - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); octave_value retval; @@ -2647,7 +2647,7 @@ { std::string arg = arglist(i).xstring_value ("addpath: all arguments must be strings"); - std::list<std::string> dir_elts = octave::split_path (arg); + std::list<std::string> dir_elts = split_path (arg); if (! append) std::reverse (dir_elts.begin (), dir_elts.end ()); @@ -2664,11 +2664,11 @@ (it_start, dir.end (), [] (char l, char r) { - return l == r && octave::sys::file_ops::is_dir_sep (l); + return l == r && sys::file_ops::is_dir_sep (l); }), dir.end ()); - auto pos = dir.find_last_of (octave::sys::file_ops::dir_sep_chars ()); + auto pos = dir.find_last_of (sys::file_ops::dir_sep_chars ()); if (pos == std::string::npos) { if (! dir.empty () && dir[0] == '+') @@ -2694,7 +2694,7 @@ } if (need_to_update) - octave::rehash_internal (); + rehash_internal (); return retval; } @@ -2728,7 +2728,7 @@ octave_value retval; - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); if (nargout > 0) retval = lp.path (); @@ -2738,7 +2738,7 @@ for (int i = 0; i < nargin; i++) { std::string arg = args(i).xstring_value ("rmpath: all arguments must be strings"); - std::list<std::string> dir_elts = octave::split_path (arg); + std::list<std::string> dir_elts = split_path (arg); for (const auto& dir : dir_elts) { @@ -2753,7 +2753,7 @@ } if (need_to_update) - octave::rehash_internal (); + rehash_internal (); return retval; } @@ -2764,7 +2764,7 @@ Undocumented internal function. @end deftypefn */) { - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); lp.display (octave_stdout);