octave: libinterp/corefcn/load-path.cc annotate

annotate libinterp/corefcn/load-path.cc @ 27101:097774bed4ed

move some static functions inside octave namespace In most files that define static functions and use the octave namespace, define the static fucntions inside the namespace. Files affected: octave-qscintilla.cc, main-window.cc, variable-editor-model.cc, variable-editor.cc, welcome-wizard.cc, call-stack.cc, environment.cc, help.cc, input.cc, load-path.cc, sysdep.cc, text-renderer.cc, url-handle-manager.cc, __ode15__.cc, ov-typeinfo.cc, aepbalance.cc, chol.cc, gsvd.cc, file-ops.cc, lo-array-errwarn.cc, lo-regexp.cc, oct-glob.cc, and oct-sparse.cc.

author	John W. Eaton <jwe@octave.org>
date	Tue, 21 May 2019 19:50:59 +0000
parents	340d44f2f942
children	84ff9953faa1

rev	line source
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1 /*
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26105 diff changeset	3 Copyright (C) 2006-2019 John W. Eaton
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	4 Copyright (C) 2010 VZLU Prague
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	5
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	6 This file is part of Octave.
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	7
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24513 diff changeset	8 Octave is free software: you can redistribute it and/or modify it
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	9 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24513 diff changeset	10 the Free Software Foundation, either version 3 of the License, or
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	11 (at your option) any later version.
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	12
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	13 Octave is distributed in the hope that it will be useful, but
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	14 WITHOUT ANY WARRANTY; without even the implied warranty of
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	16 GNU General Public License for more details.
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	17
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	18 You should have received a copy of the GNU General Public License
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	19 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24513 diff changeset	20 <https://www.gnu.org/licenses/>.
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	21
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	22 */
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	23
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21418 diff changeset	24 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	25 # include "config.h"
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	26 #endif
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	27
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	28 #include <algorithm>
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	29
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	30 #include "dir-ops.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	31 #include "file-ops.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	32 #include "file-stat.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	33 #include "oct-env.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	34 #include "pathsearch.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	35
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	36 #include "defaults.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	37 #include "defun.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	38 #include "input.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	39 #include "interpreter-private.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: 21992 diff changeset	40 #include "interpreter.h"
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	41 #include "load-path.h"
18204 adbbacce8aaf find load file in private directories (bug #35697) John W. Eaton <jwe@octave.org> parents: 18137 diff changeset	42 #include "ov-usr-fcn.h"
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	43 #include "pager.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	44 #include "parse.h"
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	45 #include "sysdep.h"
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	46 #include "unwind-prot.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	47 #include "utils.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	48
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	49 namespace octave
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	50 {
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	51 static void
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	52 maybe_add_path_elts (std::string& path, const std::string& dir)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	53 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	54 std::string tpath = octave::genpath (dir);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	55
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	56 if (! tpath.empty ())
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	57 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	58 if (path.empty ())
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	59 path = tpath;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	60 else
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	61 path += octave::directory_path::path_sep_str () + tpath;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	62 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	63 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	64
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	65 static std::list<std::string>
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	66 split_path (const std::string& p)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	67 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	68 std::list<std::string> retval;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	69
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	70 size_t beg = 0;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	71 size_t end = p.find (octave::directory_path::path_sep_char ());
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	72
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	73 size_t len = p.length ();
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	74
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	75 while (end != std::string::npos)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	76 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	77 std::string elt = p.substr (beg, end-beg);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	78
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	79 if (! elt.empty ())
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	80 retval.push_back (elt);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	81
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	82 beg = end + 1;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	83
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	84 if (beg == len)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	85 break;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	86
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	87 end = p.find (octave::directory_path::path_sep_char (), beg);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	88 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	89
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	90 std::string elt = p.substr (beg);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	91
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	92 if (! elt.empty ())
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	93 retval.push_back (elt);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	94
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	95 return retval;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	96 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	97
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	98 // Strip trailing directory separators.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	99
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	100 static std::string
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	101 strip_trailing_separators (const std::string& dir_arg)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	102 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	103 std::string dir = dir_arg;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	104
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	105 size_t k = dir.length ();
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	106
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	107 while (k > 1 && octave::sys::file_ops::is_dir_sep (dir[k-1]))
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	108 k--;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	109
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	110 if (k < dir.length ())
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	111 dir.resize (k);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	112
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	113 return dir;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	114 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	115
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	116 // Should we cache all files in private directories, or is it OK to just
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	117 // look them up each time as needed?
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	118
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	119 static std::string
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	120 find_private_file (const std::string& fname)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	121 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	122 std::string retval;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	123
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	124 // Look in private directory corresponding to current function (if
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	125 // any).
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	126
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	127 octave::symbol_scope scope = octave::__get_current_scope__ ("find_private_file");
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	128
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	129 octave_user_function *curr_fcn = scope ? scope.function () : nullptr;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	130
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	131 if (curr_fcn)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	132 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	133 // Even for private functions, dir_name doesn't contain the
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	134 // "private" directory component so we append it here in all
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	135 // cases.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	136
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	137 std::string dir_name = curr_fcn->dir_name ();
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	138
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	139 if (! dir_name.empty ())
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	140 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	141 std::string pfname = dir_name + octave::sys::file_ops::dir_sep_str ()
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	142 + "private" + octave::sys::file_ops::dir_sep_str () + fname;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	143
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	144 octave::sys::file_stat fs (pfname);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	145
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	146 if (fs.exists () && fs.is_reg ())
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	147 retval = pfname;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	148 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	149 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	150
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	151 return retval;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	152 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	153
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	154 // True if a path is contained in a path list separated by path_sep_char
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	155
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	156 static bool
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	157 in_path_list (const std::string& path_list, const std::string& path)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	158 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	159 size_t ps = path.size ();
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	160 size_t pls = path_list.size ();
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	161 size_t pos = path_list.find (path);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	162 char psc = octave::directory_path::path_sep_char ();
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	163 while (pos != std::string::npos)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	164 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	165 if ((pos == 0 \|\| path_list[pos-1] == psc)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	166 && (pos + ps == pls \|\| path_list[pos + ps] == psc))
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	167 return true;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	168 else
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	169 pos = path_list.find (path, pos + 1);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	170 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	171
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	172 return false;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	173 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	174
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	175 static void
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	176 rehash_internal (void)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	177 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	178 octave::load_path& lp = octave::__get_load_path__ ("rehash_internal");
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	179
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	180 lp.update ();
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	181
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	182 // FIXME: maybe we should rename this variable since it is being
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	183 // used for more than keeping track of the prompt time.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	184
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	185 // This will force updated functions to be found.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	186 Vlast_prompt_time.stamp ();
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	187 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	188
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	189 std::string load_path::sys_path;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	190 load_path::abs_dir_cache_type load_path::abs_dir_cache;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	191
25460 627d6bde9b8d solve installation info initialization problem differently John W. Eaton <jwe@octave.org> parents: 25440 diff changeset	192 load_path::load_path (void)
627d6bde9b8d solve installation info initialization problem differently John W. Eaton <jwe@octave.org> parents: 25440 diff changeset	193 : package_map (), top_level_package (), dir_info_list (), init_dirs (),
627d6bde9b8d solve installation info initialization problem differently John W. Eaton <jwe@octave.org> parents: 25440 diff changeset	194 m_command_line_path (),
25344 4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	195 add_hook ([this] (const std::string& dir) { this->execute_pkg_add (dir); }),
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	196 remove_hook ([this] (const std::string& dir) { this->execute_pkg_del (dir); })
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	197 { }
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	198
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	199 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	200 load_path::initialize (bool set_initial_path)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	201 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	202 sys_path = "";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	203
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	204 if (set_initial_path)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	205 {
23717 06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	206 maybe_add_path_elts (sys_path, config::local_ver_oct_file_dir ());
06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	207 maybe_add_path_elts (sys_path, config::local_api_oct_file_dir ());
06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	208 maybe_add_path_elts (sys_path, config::local_oct_file_dir ());
06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	209 maybe_add_path_elts (sys_path, config::local_ver_fcn_file_dir ());
06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	210 maybe_add_path_elts (sys_path, config::local_api_fcn_file_dir ());
06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	211 maybe_add_path_elts (sys_path, config::local_fcn_file_dir ());
06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	212 maybe_add_path_elts (sys_path, config::oct_file_dir ());
06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	213 maybe_add_path_elts (sys_path, config::fcn_file_dir ());
06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	214 maybe_add_path_elts (sys_path, config::oct_data_dir ());
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	215 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	216
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	217 std::string tpath = load_path::m_command_line_path;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	218
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	219 if (tpath.empty ())
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	220 tpath = sys::env::getenv ("OCTAVE_PATH");
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	221
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	222 std::string xpath;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	223
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	224 if (! tpath.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	225 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	226 xpath = tpath;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	227
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	228 if (! sys_path.empty ())
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	229 xpath += directory_path::path_sep_str () + sys_path;
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	230 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	231 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	232 xpath = sys_path;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	233
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	234 set (xpath, false, true);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	235 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	236
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	237 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	238 load_path::clear (void)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	239 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	240 dir_info_list.clear ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	241
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	242 top_level_package.clear ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	243
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	244 package_map.clear ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	245 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	246
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	247 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	248 load_path::set (const std::string& p, bool warn, bool is_init)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	249 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	250 // Use a list when we need to preserve order.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	251 std::list<std::string> elts = split_path (p);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	252
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	253 // Use a set when we need to search and order is not important.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	254 std::set<std::string> elts_set (elts.begin (), elts.end ());
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	255
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	256 if (is_init)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	257 init_dirs = elts_set;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	258 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	259 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	260 for (const auto& init_dir : init_dirs)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	261 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	262 if (elts_set.find (init_dir) == elts_set.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	263 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	264 warning_with_id ("Octave:remove-init-dir",
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	265 "default load path altered. Some built-in functions may not be found. Try restoredefaultpath() to recover it.");
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	266 break;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	267 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	268 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	269 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	270
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	271 // Temporarily disable add hook.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	272
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	273 unwind_protect frame;
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	274 frame.protect_var (add_hook);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	275
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	276 add_hook = nullptr;
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	277
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	278 clear ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	279
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	280 for (const auto& elt : elts)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	281 append (elt, warn);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	282
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	283 // Restore add hook and execute for all newly added directories.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	284 frame.run_first ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	285
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	286 // FIXME: Shouldn't the test for add_hook be outside the for loop?
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	287 // Why not use const here? Does add_hook change dir_info_list?
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	288 for (auto& di : dir_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	289 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	290 if (add_hook)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	291 add_hook (di.dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	292 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	293
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	294 // Always prepend current directory.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	295 prepend (".", warn);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	296 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	297
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	298 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	299 load_path::append (const std::string& dir, bool warn)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	300 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	301 if (! dir.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	302 add (dir, true, warn);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	303 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	304
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	305 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	306 load_path::prepend (const std::string& dir, bool warn)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	307 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	308 if (! dir.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	309 add (dir, false, warn);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	310 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	311
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	312 bool
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	313 load_path::remove (const std::string& dir_arg)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	314 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	315 bool retval = false;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	316
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	317 if (! dir_arg.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	318 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	319 if (dir_arg == ".")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	320 {
23803 90689bdbe048 Use C++11 raw string literals to avoid escaping double quotes. Rik <rik@octave.org> parents: 23795 diff changeset	321 warning (R"(rmpath: can't remove "." from path)");
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	322
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	323 // Avoid additional warnings.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	324 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	325 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	326 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	327 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	328 std::string dir = sys::file_ops::tilde_expand (dir_arg);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	329
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	330 dir = strip_trailing_separators (dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	331
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	332 auto i = find_dir_info (dir);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	333
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	334 if (i != dir_info_list.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	335 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	336 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	337
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	338 if (remove_hook)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	339 remove_hook (dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	340
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	341 dir_info& di = *i;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	342
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	343 remove (di);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	344
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	345 dir_info_list.erase (i);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	346 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	347 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	348 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	349
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	350 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	351 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	352
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	353 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	354 load_path::update (void) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	355 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	356 // I don't see a better way to do this because we need to
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	357 // preserve the correct directory ordering for new files that
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	358 // have appeared.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	359
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	360 top_level_package.clear ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	361
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	362 package_map.clear ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	363
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	364 for (auto& di : dir_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	365 {
25957 d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	366 bool ok = di.update ();
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	367
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	368 if (! ok)
26105 0cebf81fcdc5 Stop segfault when load-path directory does not exist (bug #55046). Rik <rik@octave.org> parents: 25958 diff changeset	369 warning ("load-path: update failed for '%s', removing from path",
0cebf81fcdc5 Stop segfault when load-path directory does not exist (bug #55046). Rik <rik@octave.org> parents: 25958 diff changeset	370 di.dir_name.c_str ());
25957 d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	371 else
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	372 add (di, true, "", true);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	373 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	374 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	375
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	376 bool
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	377 load_path::contains_canonical (const std::string& dir) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	378 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	379 bool retval = false;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	380
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	381 for (const auto& d : dir_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	382 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	383 if (same_file (dir, d.dir_name))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	384 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	385 retval = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	386 break;
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	387 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	388 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	389
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	390 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	391 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	392
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	393 std::list<std::string>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	394 load_path::overloads (const std::string& meth) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	395 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	396 std::list<std::string> retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	397
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	398 // update ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	399
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	400 top_level_package.overloads (meth, retval);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	401
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	402 for (const auto& nm_ldr : package_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	403 nm_ldr.second.overloads (meth, retval);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	404
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	405 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	406 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	407
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	408 std::list<std::string>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	409 load_path::get_all_package_names (bool only_top_level) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	410 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	411 std::list<std::string> retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	412
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	413 for (const auto& dir_ldr : package_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	414 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	415 if (! only_top_level \|\| dir_ldr.first.find ('.') == std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	416 retval.push_back (dir_ldr.first);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	417 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	418
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	419 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	420 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	421
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	422 std::string
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	423 load_path::find_file (const std::string& file) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	424 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	425 std::string retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	426
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	427 if (sys::env::absolute_pathname (file)
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	428 \|\| sys::env::rooted_relative_pathname (file))
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	429 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	430 sys::file_stat fs (file);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	431
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	432 return fs.exists () ? file : retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	433 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	434 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	435 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	436 std::string tfile = find_private_file (file);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	437
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	438 if (! tfile.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	439 return tfile;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	440 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	441
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	442 if (file.find_first_of (sys::file_ops::dir_sep_chars ())
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	443 != std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	444 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	445 // Given name has a directory separator, so append it to each
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	446 // element of the load path in turn.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	447 for (const auto& di : dir_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	448 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	449 std::string tfile = sys::file_ops::concat (di.dir_name, file);
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	450
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	451 sys::file_stat fs (tfile);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	452
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	453 if (fs.exists ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	454 return tfile;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	455 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	456 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	457 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	458 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	459 // Look in cache.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	460 for (const auto & di : dir_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	461 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	462 string_vector all_files = di.all_files;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	463
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	464 octave_idx_type len = all_files.numel ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	465
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	466 for (octave_idx_type i = 0; i < len; i++)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	467 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	468 if (all_files[i] == file)
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	469 return sys::file_ops::concat (di.dir_name, file);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	470 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	471 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	472 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	473
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	474 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	475 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	476
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	477 std::string
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	478 load_path::find_dir (const std::string& dir) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	479 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	480 std::string retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	481
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	482 if (dir.find_first_of (sys::file_ops::dir_sep_chars ()) != std::string::npos
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	483 && (sys::env::absolute_pathname (dir)
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	484 \|\| sys::env::rooted_relative_pathname (dir)))
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	485 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	486 sys::file_stat fs (dir);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	487
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	488 if (fs.exists () && fs.is_dir ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	489 return dir;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	490 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	491 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	492 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	493 for (const auto& di : dir_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	494 {
24367 1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	495 std::string dname = sys::env::make_absolute (di.dir_name);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	496
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	497 size_t dname_len = dname.length ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	498
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	499 if (dname.substr (dname_len - 1)
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	500 == sys::file_ops::dir_sep_str ())
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	501 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	502 dname = dname.substr (0, dname_len - 1);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	503 dname_len--;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	504 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	505
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	506 size_t dir_len = dir.length ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	507
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	508 if (dname_len > dir_len
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	509 && sys::file_ops::is_dir_sep (dname[dname_len - dir_len - 1])
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	510 && dir == dname.substr (dname_len - dir_len))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	511 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	512 sys::file_stat fs (di.dir_name);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	513
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	514 if (fs.exists () && fs.is_dir ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	515 return di.dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	516 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	517 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	518 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	519
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	520 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	521 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	522
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	523 string_vector
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	524 load_path::find_matching_dirs (const std::string& dir) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	525 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	526 std::list<std::string> retlist;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	527
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	528 if (dir.find_first_of (sys::file_ops::dir_sep_chars ()) != std::string::npos
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	529 && (sys::env::absolute_pathname (dir)
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	530 \|\| sys::env::rooted_relative_pathname (dir)))
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	531 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	532 sys::file_stat fs (dir);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	533
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	534 if (fs.exists () && fs.is_dir ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	535 retlist.push_back (dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	536 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	537 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	538 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	539 for (const auto& di : dir_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	540 {
24367 1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	541 std::string dname = sys::env::make_absolute (di.dir_name);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	542
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	543 size_t dname_len = dname.length ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	544
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	545 if (dname.substr (dname_len - 1)
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	546 == sys::file_ops::dir_sep_str ())
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	547 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	548 dname = dname.substr (0, dname_len - 1);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	549 dname_len--;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	550 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	551
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	552 size_t dir_len = dir.length ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	553
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	554 if (dname_len > dir_len
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	555 && sys::file_ops::is_dir_sep (dname[dname_len - dir_len - 1])
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	556 && dir == dname.substr (dname_len - dir_len))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	557 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	558 sys::file_stat fs (di.dir_name);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	559
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	560 if (fs.exists () && fs.is_dir ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	561 retlist.push_back (di.dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	562 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	563 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	564 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	565
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	566 return retlist;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	567 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	568
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	569 std::string
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	570 load_path::find_first_of (const string_vector& flist) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	571 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	572 std::string retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	573
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	574 std::string dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	575 std::string file_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	576
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	577 octave_idx_type flen = flist.numel ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	578 octave_idx_type rel_flen = 0;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	579
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	580 string_vector rel_flist (flen);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	581
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	582 for (octave_idx_type i = 0; i < flen; i++)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	583 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	584 std::string file = flist[i];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	585
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	586 if (file.find_first_of (sys::file_ops::dir_sep_chars ())
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	587 != std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	588 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	589 if (sys::env::absolute_pathname (file)
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	590 \|\| sys::env::rooted_relative_pathname (file))
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	591 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	592 sys::file_stat fs (file);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	593
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	594 if (fs.exists ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	595 return file;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	596 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	597 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	598 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	599 for (const auto& di : dir_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	600 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	601 std::string tfile;
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	602 tfile = sys::file_ops::concat (di.dir_name, file);
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	603
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	604 sys::file_stat fs (tfile);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	605
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	606 if (fs.exists ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	607 return tfile;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	608 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	609 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	610 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	611 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	612 rel_flist[rel_flen++] = file;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	613 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	614
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	615 rel_flist.resize (rel_flen);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	616
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	617 for (const auto& di : dir_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	618 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	619 string_vector all_files = di.all_files;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	620
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	621 octave_idx_type len = all_files.numel ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	622
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	623 for (octave_idx_type i = 0; i < len; i++)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	624 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	625 for (octave_idx_type j = 0; j < rel_flen; j++)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	626 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	627 if (all_files[i] == rel_flist[j])
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	628 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	629 dir_name = di.dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	630 file_name = rel_flist[j];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	631
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	632 goto done;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	633 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	634 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	635 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	636 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	637
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	638 done:
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	639
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	640 if (! dir_name.empty ())
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	641 retval = sys::file_ops::concat (dir_name, file_name);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	642
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	643 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	644 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	645
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	646 string_vector
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	647 load_path::find_all_first_of (const string_vector& flist) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	648 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	649 std::list<std::string> retlist;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	650
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	651 std::string dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	652 std::string file_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	653
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	654 octave_idx_type flen = flist.numel ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	655 octave_idx_type rel_flen = 0;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	656
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	657 string_vector rel_flist (flen);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	658
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	659 for (octave_idx_type i = 0; i < flen; i++)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	660 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	661 std::string file = flist[i];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	662
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	663 if (file.find_first_of (sys::file_ops::dir_sep_chars ())
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	664 != std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	665 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	666 if (sys::env::absolute_pathname (file)
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	667 \|\| sys::env::rooted_relative_pathname (file))
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	668 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	669 sys::file_stat fs (file);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	670
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	671 if (fs.exists ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	672 retlist.push_back (file);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	673 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	674 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	675 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	676 for (const auto& di : dir_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	677 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	678 std::string tfile;
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	679 tfile = sys::file_ops::concat (di.dir_name, file);
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	680
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	681 sys::file_stat fs (tfile);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	682
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	683 if (fs.exists ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	684 retlist.push_back (tfile);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	685 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	686 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	687 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	688 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	689 rel_flist[rel_flen++] = file;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	690 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	691
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	692 rel_flist.resize (rel_flen);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	693
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	694 for (const auto& di : dir_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	695 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	696 string_vector all_files = di.all_files;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	697
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	698 octave_idx_type len = all_files.numel ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	699
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	700 for (octave_idx_type i = 0; i < len; i++)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	701 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	702 for (octave_idx_type j = 0; j < rel_flen; j++)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	703 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	704 if (all_files[i] == rel_flist[j])
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	705 retlist.push_back (sys::file_ops::concat (di.dir_name,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	706 rel_flist[j]));
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	707 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	708 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	709 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	710
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	711 return retlist;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	712 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	713
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	714 string_vector
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	715 load_path::dirs (void) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	716 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	717 size_t len = dir_info_list.size ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	718
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	719 string_vector retval (len);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	720
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	721 octave_idx_type k = 0;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	722
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	723 for (const auto& di : dir_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	724 retval[k++] = di.dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	725
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	726 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	727 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	728
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	729 std::list<std::string>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	730 load_path::dir_list (void) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	731 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	732 std::list<std::string> retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	733
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	734 for (const auto& di : dir_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	735 retval.push_back (di.dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	736
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	737 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	738 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	739
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	740 string_vector
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	741 load_path::files (const std::string& dir, bool omit_exts) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	742 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	743 string_vector retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	744
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	745 const_dir_info_list_iterator p = find_dir_info (dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	746
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	747 if (p != dir_info_list.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	748 retval = p->fcn_files;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	749
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	750 if (omit_exts)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	751 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	752 octave_idx_type len = retval.numel ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	753
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	754 for (octave_idx_type i = 0; i < len; i++)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	755 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	756 std::string fname = retval[i];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	757
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	758 size_t pos = fname.rfind ('.');
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	759
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	760 if (pos != std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	761 retval[i] = fname.substr (0, pos);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	762 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	763 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	764
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	765 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	766 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	767
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	768 string_vector
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	769 load_path::fcn_names (void) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	770 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	771 return top_level_package.fcn_names ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	772 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	773
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	774 std::string
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	775 load_path::path (void) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	776 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	777 std::string xpath;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	778
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	779 string_vector xdirs = load_path::dirs ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	780
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	781 octave_idx_type len = xdirs.numel ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	782
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	783 if (len > 0)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	784 xpath = xdirs[0];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	785
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	786 for (octave_idx_type i = 1; i < len; i++)
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	787 xpath += directory_path::path_sep_str () + xdirs[i];
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	788
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	789 return xpath;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	790 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	791
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	792 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	793 load_path::display (std::ostream& os) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	794 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	795 for (const auto& di : dir_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	796 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	797 string_vector fcn_files = di.fcn_files;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	798
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	799 if (! fcn_files.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	800 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	801 os << "\n*** function files in " << di.dir_name << ":\n\n";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	802
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	803 fcn_files.list_in_columns (os);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	804 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	805
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	806 const dir_info::method_file_map_type& method_file_map
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	807 = di.method_file_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	808
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	809 if (! method_file_map.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	810 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	811 for (const auto& cls_ci : method_file_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	812 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	813 os << "\n*** methods in " << di.dir_name
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	814 << "/@" << cls_ci.first << ":\n\n";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	815
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	816 const dir_info::class_info& ci = cls_ci.second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	817
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	818 string_vector method_files = get_file_list (ci.method_file_map);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	819
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	820 method_files.list_in_columns (os);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	821 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	822 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	823 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	824
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	825 top_level_package.display (os);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	826
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	827 for (const auto& nm_ldr : package_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	828 nm_ldr.second.display (os);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	829 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	830
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	831 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	832 load_path::execute_pkg_add (const std::string& dir)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	833 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	834 execute_pkg_add_or_del (dir, "PKG_ADD");
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	835 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	836
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	837 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	838 load_path::execute_pkg_del (const std::string& dir)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	839 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	840 execute_pkg_add_or_del (dir, "PKG_DEL");
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	841 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	842
25344 4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	843 void load_path::execute_pkg_add_or_del (const std::string& dir,
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	844 const std::string& script_file)
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	845 {
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	846 if (! octave_interpreter_ready)
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	847 return;
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	848
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	849 octave::unwind_protect frame;
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	850
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	851 std::string file = octave::sys::file_ops::concat (dir, script_file);
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	852
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	853 octave::sys::file_stat fs (file);
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	854
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	855 if (fs.exists ())
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	856 octave::source_file (file, "base");
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	857 }
4d3ce214da32 use std::function object for load-path add/remove hook functions John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	858
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	859 // FIXME: maybe we should also maintain a map to speed up this method of access.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	860
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	861 load_path::const_dir_info_list_iterator
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	862 load_path::find_dir_info (const std::string& dir_arg) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	863 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	864 std::string dir = sys::file_ops::tilde_expand (dir_arg);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	865
25343 4d7790d9793f use cbegin, crbegin, cend, and crend and auto decls where possible John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	866 auto retval = dir_info_list.cbegin ();
4d7790d9793f use cbegin, crbegin, cend, and crend and auto decls where possible John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	867
4d7790d9793f use cbegin, crbegin, cend, and crend and auto decls where possible John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	868 while (retval != dir_info_list.cend ())
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	869 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	870 if (retval->dir_name == dir)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	871 break;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	872
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	873 retval++;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	874 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	875
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	876 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	877 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	878
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	879 load_path::dir_info_list_iterator
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	880 load_path::find_dir_info (const std::string& dir_arg)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	881 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	882 std::string dir = sys::file_ops::tilde_expand (dir_arg);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	883
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	884 auto retval = dir_info_list.begin ();
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	885
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	886 while (retval != dir_info_list.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	887 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	888 if (retval->dir_name == dir)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	889 break;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	890
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	891 retval++;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	892 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	893
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	894 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	895 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	896
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	897 bool
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	898 load_path::contains (const std::string& dir) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	899 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	900 return find_dir_info (dir) != dir_info_list.end ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	901 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	902
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	903 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	904 load_path::move (dir_info_list_iterator i, bool at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	905 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	906 if (dir_info_list.size () > 1)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	907 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	908 dir_info di = *i;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	909
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	910 dir_info_list.erase (i);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	911
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	912 if (at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	913 dir_info_list.push_back (di);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	914 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	915 dir_info_list.push_front (di);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	916
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	917 move (di, at_end);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	918 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	919 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	920
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	921 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	922 load_path::move (const dir_info& di, bool at_end, const std::string& pname)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	923 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	924 package_info& l = get_package (pname);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	925
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	926 l.move (di, at_end);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	927
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	928 dir_info::package_dir_map_type package_dir_map = di.package_dir_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	929
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	930 for (const auto& pkg_di : package_dir_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	931 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	932 std::string full_name = pkg_di.first;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	933
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	934 if (! pname.empty ())
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	935 full_name = pname + '.' + full_name;
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	936
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	937 move (pkg_di.second, at_end, full_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	938 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	939 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	940
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	941 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	942 load_path::add (const std::string& dir_arg, bool at_end, bool warn)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	943 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	944 size_t len = dir_arg.length ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	945
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	946 if (len > 1 && dir_arg.substr (len-2) == "//")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	947 warning_with_id ("Octave:recursive-path-search",
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	948 "trailing '//' is no longer special in search path elements");
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	949
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	950 std::string dir = sys::file_ops::tilde_expand (dir_arg);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	951
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	952 dir = strip_trailing_separators (dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	953
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	954 auto i = find_dir_info (dir);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	955
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	956 if (i != dir_info_list.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	957 move (i, at_end);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	958 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	959 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	960 sys::file_stat fs (dir);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	961
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	962 if (fs)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	963 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	964 if (fs.is_dir ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	965 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	966 dir_info di (dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	967
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	968 if (at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	969 dir_info_list.push_back (di);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	970 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	971 dir_info_list.push_front (di);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	972
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	973 add (di, at_end);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	974
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	975 if (add_hook)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	976 add_hook (dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	977 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	978 else if (warn)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	979 warning ("addpath: %s: not a directory", dir_arg.c_str ());
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	980 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	981 else if (warn)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	982 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	983 std::string msg = fs.error ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	984 warning ("addpath: %s: %s", dir_arg.c_str (), msg.c_str ());
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	985 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	986 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	987
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	988 // FIXME: is there a better way to do this?
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	989
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	990 i = find_dir_info (".");
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	991
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	992 if (i != dir_info_list.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	993 move (i, false);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	994 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	995
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	996 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	997 load_path::remove (const dir_info& di, const std::string& pname)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	998 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	999 package_info& l = get_package (pname);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1000
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1001 l.remove (di);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1002
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1003 dir_info::package_dir_map_type package_dir_map = di.package_dir_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1004
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1005 for (const auto& pkg_di : package_dir_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1006 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1007 std::string full_name = pkg_di.first;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1008
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1009 if (! pname.empty ())
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	1010 full_name = pname + '.' + full_name;
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1011
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1012 remove (pkg_di.second, full_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1013 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1014 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1015
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1016 bool
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1017 load_path::is_package (const std::string& name) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1018 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1019 for (const auto& di : dir_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1020 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1021 if (di.is_package (name))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1022 return true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1023 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1024
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1025 return false;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1026 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1027
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1028 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1029 load_path::add (const dir_info& di, bool at_end,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1030 const std::string& pname, bool updating) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1031 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1032 package_info& l = get_package (pname);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1033
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1034 l.add (di, at_end, updating);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1035
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1036 dir_info::package_dir_map_type package_dir_map = di.package_dir_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1037
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1038 for (const auto& pkg_di : package_dir_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1039 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1040 std::string full_name = pkg_di.first;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1041
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1042 if (! pname.empty ())
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	1043 full_name = pname + '.' + full_name;
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1044
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1045 add (pkg_di.second, at_end, full_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1046 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1047 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1048
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1049 string_vector
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1050 load_path::get_file_list (const load_path::dir_info::fcn_file_map_type& lst) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1051 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1052 octave_idx_type n = lst.size ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1053
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1054 string_vector retval (n);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1055
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1056 octave_idx_type count = 0;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1057
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1058 for (const auto& nm_typ : lst)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1059 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1060 std::string nm = nm_typ.first;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1061
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1062 int types = nm_typ.second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1063
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1064 if (types & load_path::OCT_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1065 nm += ".oct";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1066 else if (types & load_path::MEX_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1067 nm += ".mex";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1068 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1069 nm += ".m";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1070
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1071 retval[count++] = nm;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1072 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1073
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1074 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1075 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1076
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1077 load_path::dir_info::fcn_file_map_type
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1078 get_fcn_files (const std::string& d)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1079 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1080 load_path::dir_info::fcn_file_map_type retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1081
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	1082 string_vector flist;
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	1083 std::string msg;
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	1084
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	1085 if (! octave::sys::get_dirlist (d, flist, msg))
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	1086 warning ("load_path: %s: %s", d.c_str (), msg.c_str ());
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	1087 else
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1088 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1089 octave_idx_type len = flist.numel ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1090
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1091 for (octave_idx_type i = 0; i < len; i++)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1092 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1093 std::string fname = flist[i];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1094
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1095 size_t pos = fname.rfind ('.');
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1096
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1097 if (pos != std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1098 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1099 std::string base = fname.substr (0, pos);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1100 std::string ext = fname.substr (pos);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1101
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1102 if (valid_identifier (base))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1103 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1104 int t = 0;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1105
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1106 if (ext == ".m")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1107 t = load_path::M_FILE;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1108 else if (ext == ".oct")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1109 t = load_path::OCT_FILE;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1110 else if (ext == ".mex")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1111 t = load_path::MEX_FILE;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1112
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1113 if (t)
25376 cc40e47d3a44 track multiple file types (oct\|m\|mex) for private functions (bug #53856) John W. Eaton <jwe@octave.org> parents: 25374 diff changeset	1114 {
cc40e47d3a44 track multiple file types (oct\|m\|mex) for private functions (bug #53856) John W. Eaton <jwe@octave.org> parents: 25374 diff changeset	1115 load_path::dir_info::fcn_file_map_iterator p
cc40e47d3a44 track multiple file types (oct\|m\|mex) for private functions (bug #53856) John W. Eaton <jwe@octave.org> parents: 25374 diff changeset	1116 = retval.find (base);
cc40e47d3a44 track multiple file types (oct\|m\|mex) for private functions (bug #53856) John W. Eaton <jwe@octave.org> parents: 25374 diff changeset	1117
cc40e47d3a44 track multiple file types (oct\|m\|mex) for private functions (bug #53856) John W. Eaton <jwe@octave.org> parents: 25374 diff changeset	1118 if (p == retval.end ())
cc40e47d3a44 track multiple file types (oct\|m\|mex) for private functions (bug #53856) John W. Eaton <jwe@octave.org> parents: 25374 diff changeset	1119 retval[base] = t;
cc40e47d3a44 track multiple file types (oct\|m\|mex) for private functions (bug #53856) John W. Eaton <jwe@octave.org> parents: 25374 diff changeset	1120 else
cc40e47d3a44 track multiple file types (oct\|m\|mex) for private functions (bug #53856) John W. Eaton <jwe@octave.org> parents: 25374 diff changeset	1121 p->second \|= t;
cc40e47d3a44 track multiple file types (oct\|m\|mex) for private functions (bug #53856) John W. Eaton <jwe@octave.org> parents: 25374 diff changeset	1122 }
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1123 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1124 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1125 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1126 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1127
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1128 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1129 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1130
25957 d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1131 bool
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1132 load_path::dir_info::update (void)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1133 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1134 sys::file_stat fs (dir_name);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1135
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1136 if (! fs)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1137 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1138 std::string msg = fs.error ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1139 warning ("load_path: %s: %s", dir_name.c_str (), msg.c_str ());
25957 d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1140 return false;
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1141 }
25957 d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1142
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1143 sys::file_stat pfs (sys::file_ops::concat (dir_name, "private"));
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1144 bool has_private_dir = pfs && pfs.is_dir ();
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1145
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1146 if (is_relative)
24367 1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1147 {
25957 d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1148 try
24367 1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1149 {
25957 d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1150 std::string abs_name = sys::env::make_absolute (dir_name);
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1151
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1152 const_abs_dir_cache_iterator p = abs_dir_cache.find (abs_name);
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1153
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1154 if (p != abs_dir_cache.end ())
24367 1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1155 {
25957 d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1156 // The directory is in the cache of all directories we have
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1157 // visited (indexed by absolute name). If it is out of date,
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1158 // initialize it. Otherwise, copy the info from the cache.
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1159 // By doing that, we avoid unnecessary calls to stat that can
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1160 // slow things down tremendously for large directories.
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1161 const dir_info& di = p->second;
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1162
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1163 if ((fs.mtime () + fs.time_resolution ()
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1164 > di.dir_time_last_checked)
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1165 \|\| (has_private_dir
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1166 && (pfs.mtime () + pfs.time_resolution ()
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1167 > dir_time_last_checked)))
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1168 initialize ();
24367 1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1169 else
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1170 {
25957 d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1171 // Copy over info from cache, but leave dir_name and
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1172 // is_relative unmodified.
25958 56ac36b5f7b0 eliminate unnecessary use of this-> in member function John W. Eaton <jwe@octave.org> parents: 25957 diff changeset	1173 abs_dir_name = di.abs_dir_name;
56ac36b5f7b0 eliminate unnecessary use of this-> in member function John W. Eaton <jwe@octave.org> parents: 25957 diff changeset	1174 dir_mtime = di.dir_mtime;
56ac36b5f7b0 eliminate unnecessary use of this-> in member function John W. Eaton <jwe@octave.org> parents: 25957 diff changeset	1175 dir_time_last_checked = di.dir_time_last_checked;
56ac36b5f7b0 eliminate unnecessary use of this-> in member function John W. Eaton <jwe@octave.org> parents: 25957 diff changeset	1176 all_files = di.all_files;
56ac36b5f7b0 eliminate unnecessary use of this-> in member function John W. Eaton <jwe@octave.org> parents: 25957 diff changeset	1177 fcn_files = di.fcn_files;
56ac36b5f7b0 eliminate unnecessary use of this-> in member function John W. Eaton <jwe@octave.org> parents: 25957 diff changeset	1178 private_file_map = di.private_file_map;
56ac36b5f7b0 eliminate unnecessary use of this-> in member function John W. Eaton <jwe@octave.org> parents: 25957 diff changeset	1179 method_file_map = di.method_file_map;
56ac36b5f7b0 eliminate unnecessary use of this-> in member function John W. Eaton <jwe@octave.org> parents: 25957 diff changeset	1180 package_dir_map = di.package_dir_map;
24367 1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1181 }
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1182 }
25957 d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1183 else
24367 1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1184 {
25957 d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1185 // We haven't seen this directory before.
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1186 initialize ();
24367 1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1187 }
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1188 }
25957 d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1189 catch (const execution_exception&)
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1190 {
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1191 // Skip updating if we don't know where we are,
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1192 // but don't treat it as an error.
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1193 interpreter::recover_from_exception ();
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1194 }
24367 1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1195 }
25957 d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1196 // Absolute path, check timestamp to see whether it requires re-caching
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1197 else if (fs.mtime () + fs.time_resolution () > dir_time_last_checked
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1198 \|\| (has_private_dir
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1199 && (pfs.mtime () + pfs.time_resolution ()
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1200 > dir_time_last_checked)))
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1201 initialize ();
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1202
d8993fe43a64 remove nonexistent directories when updating loadpath John W. Eaton <jwe@octave.org> parents: 25952 diff changeset	1203 return true;
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1204 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1205
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1206 bool
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1207 load_path::dir_info::is_package (const std::string& name) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1208 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1209 size_t pos = name.find ('.');
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1210
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1211 if (pos == std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1212 return package_dir_map.find (name) != package_dir_map.end ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1213 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1214 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1215 std::string name_head = name.substr (0, pos);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1216 std::string name_tail = name.substr (pos + 1);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1217
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1218 const_package_dir_map_iterator it = package_dir_map.find (name_head);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1219
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1220 if (it != package_dir_map.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1221 return it->second.is_package (name_tail);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1222 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1223 return false;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1224 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1225 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1226
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1227 void
26970 340d44f2f942 backout changeset 98f1a964ff33 John W. Eaton <jwe@octave.org> parents: 26781 diff changeset	1228 load_path::dir_info::initialize (void)
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1229 {
24367 1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1230 is_relative = ! sys::env::absolute_pathname (dir_name);
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1231
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1232 dir_time_last_checked = sys::time (static_cast<time_t> (0));
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1233
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1234 sys::file_stat fs (dir_name);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1235
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1236 if (fs)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1237 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1238 method_file_map.clear ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1239 package_dir_map.clear ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1240
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1241 dir_mtime = fs.mtime ();
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1242 dir_time_last_checked = sys::time ();
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1243
26970 340d44f2f942 backout changeset 98f1a964ff33 John W. Eaton <jwe@octave.org> parents: 26781 diff changeset	1244 get_file_list (dir_name);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1245
24367 1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1246 try
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1247 {
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1248 std::string abs_name = sys::env::make_absolute (dir_name);
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1249
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1250 // FIXME: nothing is ever removed from this cache of
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1251 // directory information, so there could be some resource
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1252 // problems. Perhaps it should be pruned from time to time.
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1253
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1254 abs_dir_cache[abs_name] = *this;
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1255 }
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1256 catch (const execution_exception&)
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1257 {
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1258 // Skip updating if we don't know where we are but don't treat
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1259 // it as an error.
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1260
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1261 interpreter::recover_from_exception ();
1909f2d7a36e Backed out changeset 4e746afab617 John W. Eaton <jwe@octave.org> parents: 24363 diff changeset	1262 }
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1263 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1264 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1265 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1266 std::string msg = fs.error ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1267 warning ("load_path: %s: %s", dir_name.c_str (), msg.c_str ());
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1268 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1269 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1270
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1271 void
26970 340d44f2f942 backout changeset 98f1a964ff33 John W. Eaton <jwe@octave.org> parents: 26781 diff changeset	1272 load_path::dir_info::get_file_list (const std::string& d)
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1273 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1274 sys::dir_entry dir (d);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1275
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1276 if (dir)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1277 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1278 string_vector flist = dir.read ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1279
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1280 octave_idx_type len = flist.numel ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1281
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1282 all_files.resize (len);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1283 fcn_files.resize (len);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1284
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1285 octave_idx_type all_files_count = 0;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1286 octave_idx_type fcn_files_count = 0;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1287
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1288 for (octave_idx_type i = 0; i < len; i++)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1289 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1290 std::string fname = flist[i];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1291
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1292 std::string full_name = sys::file_ops::concat (d, fname);
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1293
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1294 sys::file_stat fs (full_name);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1295
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1296 if (fs)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1297 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1298 if (fs.is_dir ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1299 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1300 if (fname == "private")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1301 get_private_file_map (full_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1302 else if (fname[0] == '@')
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1303 get_method_file_map (full_name, fname.substr (1));
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1304 else if (fname[0] == '+')
26970 340d44f2f942 backout changeset 98f1a964ff33 John W. Eaton <jwe@octave.org> parents: 26781 diff changeset	1305 get_package_dir (full_name, fname.substr (1));
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1306 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1307 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1308 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1309 all_files[all_files_count++] = fname;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1310
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1311 size_t pos = fname.rfind ('.');
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1312
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1313 if (pos != std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1314 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1315 std::string ext = fname.substr (pos);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1316
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1317 if (ext == ".m" \|\| ext == ".oct" \|\| ext == ".mex")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1318 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1319 std::string base = fname.substr (0, pos);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1320
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1321 if (valid_identifier (base))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1322 fcn_files[fcn_files_count++] = fname;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1323 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1324 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1325 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1326 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1327 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1328
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1329 all_files.resize (all_files_count);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1330 fcn_files.resize (fcn_files_count);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1331 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1332 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1333 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1334 std::string msg = dir.error ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1335 warning ("load_path: %s: %s", d.c_str (), msg.c_str ());
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1336 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1337 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1338
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1339 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1340 load_path::dir_info::get_private_file_map (const std::string& d)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1341 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1342 private_file_map = get_fcn_files (d);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1343 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1344
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1345 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1346 load_path::dir_info::get_method_file_map (const std::string& d,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1347 const std::string& class_name)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1348 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1349 method_file_map[class_name].method_file_map = get_fcn_files (d);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1350
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1351 std::string pd = sys::file_ops::concat (d, "private");
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1352
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1353 sys::file_stat fs (pd);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1354
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1355 if (fs && fs.is_dir ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1356 method_file_map[class_name].private_file_map = get_fcn_files (pd);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1357 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1358
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1359 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1360 load_path::dir_info::get_package_dir (const std::string& d,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1361 const std::string& package_name)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1362 {
26970 340d44f2f942 backout changeset 98f1a964ff33 John W. Eaton <jwe@octave.org> parents: 26781 diff changeset	1363 package_dir_map[package_name] = dir_info (d);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1364 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1365
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1366 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1367 load_path::package_info::move (const dir_info& di, bool at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1368 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1369 std::string dir_name = di.dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1370
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	1371 auto s = std::find (dir_list.begin (), dir_list.end (), dir_name);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1372
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1373 if (s != dir_list.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1374 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1375 dir_list.erase (s);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1376
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1377 if (at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1378 dir_list.push_back (dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1379 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1380 dir_list.push_front (dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1381 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1382
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1383 move_fcn_map (dir_name, di.fcn_files, at_end);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1384
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1385 // No need to move elements of private function map.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1386
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1387 move_method_map (dir_name, at_end);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1388 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1389
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1390 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1391 load_path::package_info::remove (const dir_info& di)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1392 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1393 std::string dir = di.dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1394
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1395 string_vector fcn_files = di.fcn_files;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1396
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1397 dir_list.remove (dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1398
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1399 remove_fcn_map (dir, fcn_files);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1400
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1401 remove_private_fcn_map (dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1402
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1403 remove_method_map (dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1404 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1405
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1406 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1407 load_path::package_info::display (std::ostream& os) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1408 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1409 os << "*** package_info: "
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1410 << (m_package_name.empty () ? "<top-level>" : m_package_name)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1411 << "\n\n";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1412
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1413 for (const auto& dir : dir_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1414 os << dir << "\n";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1415 os << "\n";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1416
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1417 for (const auto& dir_fnlst : private_fcn_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1418 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1419 os << "\n*** private functions in "
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1420 << sys::file_ops::concat (dir_fnlst.first, "private")
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1421 << ":\n\n";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1422
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1423 print_fcn_list (os, dir_fnlst.second);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1424 }
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16567 diff changeset	1425
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16567 diff changeset	1426 #if defined (DEBUG_LOAD_PATH)
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16567 diff changeset	1427
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1428 for (const auto& nm_filst : fcn_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1429 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1430 os << nm_filst.first << ":\n";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1431
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1432 const file_info_list_type& file_info_list = nm_filst.second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1433
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1434 for (const auto& finfo : file_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1435 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1436 os << " " << finfo.dir_name << " (";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1437
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1438 print_types (os, finfo.types);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1439
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1440 os << ")\n";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1441 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1442 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1443
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1444 for (const auto& cls_fnmap : method_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1445 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1446 os << "CLASS " << cls_fnmap.first << ":\n";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1447
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1448 const fcn_map_type& fm = cls_fnmap.second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1449
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1450 for (const auto& nm_fnlst : fcn_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1451 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1452 os << " " << nm_fnlst.first << ":\n";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1453
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1454 const file_info_list_type& file_info_list = nm_fnlst.second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1455
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1456 for (const auto& finfo : file_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1457 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1458 os << " " << finfo.dir_name << " (";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1459
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1460 print_types (os, finfo.types);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1461
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1462 os << ")\n";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1463 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1464 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1465 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1466
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1467 os << "\n";
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16567 diff changeset	1468
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16567 diff changeset	1469 #endif
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1470 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1471
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1472 std::string
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1473 load_path::package_info::find_fcn (const std::string& fcn,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1474 std::string& dir_name,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1475 int type) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1476 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1477 std::string retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1478
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1479 // update ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1480
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1481 if (fcn.length () > 0 && fcn[0] == '@')
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1482 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1483 size_t pos = fcn.find ('/');
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1484
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1485 if (pos != std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1486 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1487 std::string class_name = fcn.substr (1, pos-1);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1488 std::string meth = fcn.substr (pos+1);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1489
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1490 retval = find_method (class_name, meth, dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1491 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1492 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1493 retval = "";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1494 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1495 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1496 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1497 dir_name = "";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1498
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1499 const_fcn_map_iterator p = fcn_map.find (fcn);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1500
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1501 if (p != fcn_map.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1502 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1503 const file_info_list_type& file_info_list = p->second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1504
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1505 for (const auto& fi : file_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1506 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1507 retval = sys::file_ops::concat (fi.dir_name, fcn);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1508
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1509 if (check_file_type (retval, type, fi.types,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1510 fcn, "load_path::find_fcn"))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1511 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1512 dir_name = fi.dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1513 break;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1514 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1515 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1516 retval = "";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1517 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1518 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1519 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1520
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1521 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1522 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1523
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1524 std::string
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1525 load_path::package_info::find_private_fcn (const std::string& dir,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1526 const std::string& fcn,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1527 int type) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1528 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1529 std::string retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1530
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1531 // update ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1532
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1533 const_private_fcn_map_iterator q = private_fcn_map.find (dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1534
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1535 if (q != private_fcn_map.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1536 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1537 const dir_info::fcn_file_map_type& m = q->second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1538
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1539 dir_info::const_fcn_file_map_iterator p = m.find (fcn);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1540
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1541 if (p != m.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1542 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1543 std::string fname
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1544 = sys::file_ops::concat (sys::file_ops::concat (dir, "private"), fcn);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1545
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1546 if (check_file_type (fname, type, p->second, fcn,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1547 "load_path::find_private_fcn"))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1548 retval = fname;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1549 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1550 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1551
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1552 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1553 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1554
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1555 std::string
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1556 load_path::package_info::find_method (const std::string& class_name,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1557 const std::string& meth,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1558 std::string& dir_name,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1559 int type) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1560 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1561 std::string retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1562
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1563 // update ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1564
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1565 dir_name = "";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1566
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1567 const_method_map_iterator q = method_map.find (class_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1568
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1569 if (q != method_map.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1570 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1571 const fcn_map_type& m = q->second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1572
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1573 const_fcn_map_iterator p = m.find (meth);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1574
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1575 if (p != m.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1576 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1577 const file_info_list_type& file_info_list = p->second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1578
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1579 for (const auto& fi : file_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1580 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1581 retval = sys::file_ops::concat (fi.dir_name, meth);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1582
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1583 bool found = check_file_type (retval, type, fi.types,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1584 meth, "load_path::find_method");
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1585
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1586 if (found)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1587 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1588 dir_name = fi.dir_name;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1589 break;
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1590 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1591 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1592 retval = "";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1593 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1594 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1595 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1596
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1597 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1598 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1599
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1600 std::list<std::string>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1601 load_path::package_info::methods (const std::string& class_name) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1602 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1603 std::list<std::string> retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1604
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1605 // update ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1606
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1607 const_method_map_iterator mtd_map_it = method_map.find (class_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1608
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1609 if (mtd_map_it != method_map.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1610 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1611 for (const auto& nm_filst : mtd_map_it->second)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1612 retval.push_back (nm_filst.first);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1613 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1614
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1615 if (! retval.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1616 retval.sort ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1617
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1618 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1619 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1620
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1621 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1622 load_path::package_info::overloads (const std::string& meth,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1623 std::list<std::string>& l) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1624 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1625 for (const auto& cls_fnmap : method_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1626 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1627 const fcn_map_type& m = cls_fnmap.second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1628
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1629 if (m.find (meth) != m.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1630 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1631 std::string class_name = cls_fnmap.first;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1632
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1633 if (! m_package_name.empty ())
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	1634 class_name = m_package_name + '.' + class_name;
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1635
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1636 l.push_back (class_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1637 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1638 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1639 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1640
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1641 string_vector
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1642 load_path::package_info::fcn_names (void) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1643 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1644 size_t len = fcn_map.size ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1645
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1646 string_vector retval (len);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1647
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1648 octave_idx_type count = 0;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1649
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1650 for (const auto& nm_filst : fcn_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1651 retval[count++] = nm_filst.first;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1652
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1653 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1654 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1655
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1656 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1657 load_path::package_info::add_to_fcn_map (const dir_info& di,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1658 bool at_end, bool updating)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1659 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1660 std::string dir_name = di.dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1661
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1662 string_vector fcn_files = di.fcn_files;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1663
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1664 octave_idx_type len = fcn_files.numel ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1665
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1666 for (octave_idx_type i = 0; i < len; i++)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1667 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1668 std::string fname = fcn_files[i];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1669
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1670 std::string ext;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1671 std::string base = fname;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1672
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1673 size_t pos = fname.rfind ('.');
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1674
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1675 if (pos != std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1676 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1677 base = fname.substr (0, pos);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1678 ext = fname.substr (pos);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1679 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1680
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1681 file_info_list_type& file_info_list = fcn_map[base];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1682
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	1683 auto p = file_info_list.begin ();
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1684
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1685 while (p != file_info_list.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1686 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1687 if (p->dir_name == dir_name)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1688 break;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1689
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1690 p++;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1691 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1692
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1693 int t = 0;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1694 if (ext == ".m")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1695 t = load_path::M_FILE;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1696 else if (ext == ".oct")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1697 t = load_path::OCT_FILE;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1698 else if (ext == ".mex")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1699 t = load_path::MEX_FILE;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1700
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1701 if (p == file_info_list.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1702 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1703 // Warn if a built-in or library function is being shadowed,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1704 // but not if we are just updating (rehashing) the list.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1705
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1706 if (! updating)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1707 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1708 if (file_info_list.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1709 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1710 symbol_table& symtab
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1711 = __get_symbol_table__ ("load_path::package_info::add_to_fcn_map");
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23586 diff changeset	1712
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23586 diff changeset	1713 if (symtab.is_built_in_function_name (base))
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1714 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1715 std::string fcn_path = sys::file_ops::concat (dir_name, fname);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1716
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1717 warning_with_id ("Octave:shadowed-function",
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1718 "function %s shadows a built-in function",
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1719 fcn_path.c_str ());
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1720 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1721 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1722 else if (! at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1723 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1724 file_info& old = file_info_list.front ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1725
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1726 // FIXME: do we need to be more careful about the
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1727 // way we look for old.dir_name in sys_path to avoid
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1728 // partial matches?
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1729
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1730 // Don't warn about Contents.m files since we expect
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1731 // more than one to exist in the load path.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1732
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1733 if (fname != "Contents.m"
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1734 && sys_path.find (old.dir_name) != std::string::npos
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1735 && in_path_list (sys_path, old.dir_name))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1736 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1737 std::string fcn_path = sys::file_ops::concat (dir_name, fname);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1738
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1739 warning_with_id ("Octave:shadowed-function",
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1740 "function %s shadows a core library function",
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1741 fcn_path.c_str ());
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1742 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1743 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1744 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1745
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1746 file_info fi (dir_name, t);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1747
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1748 if (at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1749 file_info_list.push_back (fi);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1750 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1751 file_info_list.push_front (fi);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1752 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1753 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1754 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1755 file_info& fi = *p;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1756
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1757 fi.types \|= t;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1758 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1759 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1760 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1761
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1762 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1763 load_path::package_info::add_to_private_fcn_map (const dir_info& di)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1764 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1765 dir_info::fcn_file_map_type private_file_map = di.private_file_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1766
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1767 if (! private_file_map.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1768 private_fcn_map[di.dir_name] = private_file_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1769 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1770
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1771 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1772 load_path::package_info::add_to_method_map (const dir_info& di, bool at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1773 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1774 std::string dir_name = di.dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1775
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1776 // <CLASS_NAME, CLASS_INFO>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1777 dir_info::method_file_map_type method_file_map = di.method_file_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1778
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1779 for (const auto& cls_ci : method_file_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1780 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1781 std::string class_name = cls_ci.first;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1782
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1783 fcn_map_type& fm = method_map[class_name];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1784
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1785 std::string full_dir_name
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	1786 = sys::file_ops::concat (dir_name, '@' + class_name);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1787
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1788 const dir_info::class_info& ci = cls_ci.second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1789
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1790 // <FCN_NAME, TYPES>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1791 const dir_info::fcn_file_map_type& m = ci.method_file_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1792
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1793 for (const auto& nm_typ : m)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1794 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1795 std::string base = nm_typ.first;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1796 int types = nm_typ.second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1797
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1798 file_info_list_type& file_info_list = fm[base];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1799
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	1800 auto p2 = file_info_list.begin ();
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1801 while (p2 != file_info_list.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1802 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1803 if (p2->dir_name == full_dir_name)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1804 break;
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1805
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1806 p2++;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1807 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1808
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1809 if (p2 == file_info_list.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1810 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1811 file_info fi (full_dir_name, types);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1812
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1813 if (at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1814 file_info_list.push_back (fi);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1815 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1816 file_info_list.push_front (fi);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1817 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1818 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1819 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1820 // FIXME: is this possible?
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1821 file_info& fi = *p2;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1822
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1823 fi.types = types;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1824 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1825 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1826
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1827 // <FCN_NAME, TYPES>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1828 dir_info::fcn_file_map_type private_file_map = ci.private_file_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1829
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1830 if (! private_file_map.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1831 private_fcn_map[full_dir_name] = private_file_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1832 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1833 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1834
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1835 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1836 load_path::package_info::move_fcn_map (const std::string& dir_name,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1837 const string_vector& fcn_files, bool at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1838 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1839 octave_idx_type len = fcn_files.numel ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1840
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1841 for (octave_idx_type k = 0; k < len; k++)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1842 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1843 std::string fname = fcn_files[k];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1844
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1845 std::string ext;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1846 std::string base = fname;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1847
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1848 size_t pos = fname.rfind ('.');
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1849
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1850 if (pos != std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1851 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1852 base = fname.substr (0, pos);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1853 ext = fname.substr (pos);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1854 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1855
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1856 file_info_list_type& file_info_list = fcn_map[base];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1857
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1858 if (file_info_list.size () == 1)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1859 continue;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1860 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1861 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1862 for (auto fi_it = file_info_list.begin ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1863 fi_it != file_info_list.end ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1864 fi_it++)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1865 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1866 if (fi_it->dir_name == dir_name)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1867 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1868 file_info fi_tmp = *fi_it;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1869
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1870 file_info_list.erase (fi_it);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1871
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1872 if (at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1873 file_info_list.push_back (fi_tmp);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1874 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1875 file_info_list.push_front (fi_tmp);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1876
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1877 break;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1878 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1879 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1880 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1881 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1882 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1883
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1884 void
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	1885 load_path::package_info::move_method_map (const std::string& dir_name,
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	1886 bool at_end)
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1887 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1888 for (auto& cls_fnmap : method_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1889 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1890 std::string class_name = cls_fnmap.first;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1891
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1892 fcn_map_type& fn_map = cls_fnmap.second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1893
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1894 std::string full_dir_name
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	1895 = sys::file_ops::concat (dir_name, '@' + class_name);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1896
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1897 for (auto& nm_filst : fn_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1898 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1899 file_info_list_type& file_info_list = nm_filst.second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1900
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1901 if (file_info_list.size () == 1)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1902 continue;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1903 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1904 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1905 for (auto fi_it = file_info_list.begin ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1906 fi_it != file_info_list.end (); fi_it++)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1907 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1908 if (fi_it->dir_name == full_dir_name)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1909 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1910 file_info fi_tmp = *fi_it;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1911
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1912 file_info_list.erase (fi_it);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1913
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1914 if (at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1915 file_info_list.push_back (fi_tmp);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1916 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1917 file_info_list.push_front (fi_tmp);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1918
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1919 break;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1920 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1921 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1922 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1923 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1924 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1925 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1926
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1927 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1928 load_path::package_info::remove_fcn_map (const std::string& dir,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1929 const string_vector& fcn_files)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1930 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1931 octave_idx_type len = fcn_files.numel ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1932
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1933 for (octave_idx_type k = 0; k < len; k++)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1934 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1935 std::string fname = fcn_files[k];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1936
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1937 std::string ext;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1938 std::string base = fname;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1939
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1940 size_t pos = fname.rfind ('.');
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1941
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1942 if (pos != std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1943 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1944 base = fname.substr (0, pos);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1945 ext = fname.substr (pos);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1946 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1947
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1948 file_info_list_type& file_info_list = fcn_map[base];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1949
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1950 for (auto fi_it = file_info_list.begin ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1951 fi_it != file_info_list.end ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1952 fi_it++)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1953 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1954 if (fi_it->dir_name == dir)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1955 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1956 file_info_list.erase (fi_it);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1957
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1958 if (file_info_list.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1959 fcn_map.erase (fname);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1960
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1961 break;
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1962 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1963 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1964 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1965 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1966
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1967 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1968 load_path::package_info::remove_private_fcn_map (const std::string& dir)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1969 {
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	1970 auto p = private_fcn_map.find (dir);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1971
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1972 if (p != private_fcn_map.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1973 private_fcn_map.erase (p);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1974 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1975
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1976 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1977 load_path::package_info::remove_method_map (const std::string& dir)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1978 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1979 for (auto& cls_fnmap : method_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1980 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1981 std::string class_name = cls_fnmap.first;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1982
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1983 fcn_map_type& fn_map = cls_fnmap.second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1984
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1985 std::string full_dir_name
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	1986 = sys::file_ops::concat (dir, '@' + class_name);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1987
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1988 for (auto& nm_filst : fn_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1989 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1990 file_info_list_type& file_info_list = nm_filst.second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1991
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1992 if (file_info_list.size () == 1)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1993 continue;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1994 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1995 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1996 for (auto fi_it = file_info_list.begin ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1997 fi_it != file_info_list.end (); fi_it++)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1998 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1999 if (fi_it->dir_name == full_dir_name)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2000 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2001 file_info_list.erase (fi_it);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2002 // FIXME: if there are no other elements, we
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2003 // should remove this element of fn_map but calling
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2004 // erase here would invalidate the iterator fi_it.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2005
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2006 break;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2007 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2008 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2009 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2010 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2011 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2012 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2013
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2014 bool
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2015 load_path::package_info::check_file_type (std::string& fname, int type,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2016 int possible_types,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2017 const std::string& fcn,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2018 const char *who) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2019 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2020 bool retval = false;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2021
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2022 if (type == load_path::OCT_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2023 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2024 if ((type & possible_types) == load_path::OCT_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2025 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2026 fname += ".oct";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2027 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2028 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2029 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2030 else if (type == load_path::M_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2031 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2032 if ((type & possible_types) == load_path::M_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2033 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2034 fname += ".m";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2035 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2036 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2037 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2038 else if (type == load_path::MEX_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2039 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2040 if ((type & possible_types) == load_path::MEX_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2041 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2042 fname += ".mex";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2043 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2044 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2045 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2046 else if (type == (load_path::M_FILE \| load_path::OCT_FILE))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2047 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2048 if (possible_types & load_path::OCT_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2049 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2050 fname += ".oct";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2051 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2052 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2053 else if (possible_types & load_path::M_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2054 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2055 fname += ".m";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2056 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2057 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2058 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2059 else if (type == (load_path::M_FILE \| load_path::MEX_FILE))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2060 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2061 if (possible_types & load_path::MEX_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2062 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2063 fname += ".mex";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2064 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2065 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2066 else if (possible_types & load_path::M_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2067 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2068 fname += ".m";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2069 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2070 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2071 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2072 else if (type == (load_path::OCT_FILE \| load_path::MEX_FILE))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2073 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2074 if (possible_types & load_path::OCT_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2075 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2076 fname += ".oct";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2077 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2078 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2079 else if (possible_types & load_path::MEX_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2080 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2081 fname += ".mex";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2082 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2083 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2084 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2085 else if (type == (load_path::M_FILE \| load_path::OCT_FILE
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2086 \| load_path::MEX_FILE))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2087 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2088 if (possible_types & load_path::OCT_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2089 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2090 fname += ".oct";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2091 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2092 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2093 else if (possible_types & load_path::MEX_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2094 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2095 fname += ".mex";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2096 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2097 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2098 else if (possible_types & load_path::M_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2099 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2100 fname += ".m";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2101 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2102 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2103 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2104 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2105 error ("%s: %s: invalid type code = %d", who, fcn.c_str (), type);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2106
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2107 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2108 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2109
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2110 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2111 load_path::package_info::print_types (std::ostream& os, int types) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2112 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2113 bool printed_type = false;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2114
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2115 if (types & load_path::OCT_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2116 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2117 os << "oct";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2118 printed_type = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2119 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2120
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2121 if (types & load_path::MEX_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2122 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2123 if (printed_type)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	2124 os << '\|';
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2125 os << "mex";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2126 printed_type = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2127 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2128
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2129 if (types & load_path::M_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2130 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2131 if (printed_type)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	2132 os << '\|';
336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	2133 os << 'm';
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2134 printed_type = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2135 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2136 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2137
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2138 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2139 load_path::package_info::print_fcn_list (std::ostream& os,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2140 const load_path::dir_info::fcn_file_map_type& lst) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2141 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2142 for (const auto& nm_typ : lst)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2143 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2144 os << " " << nm_typ.first << " (";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2145
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2146 print_types (os, nm_typ.second);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2147
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2148 os << ")\n";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2149 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2150 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2151
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2152 std::string
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2153 genpath (const std::string& dirname, const string_vector& skip)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2154 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2155 std::string retval;
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2156 string_vector dirlist;
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2157 std::string msg;
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2158
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2159 if (! sys::get_dirlist (dirname, dirlist, msg))
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2160 return retval;
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2161
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2162 retval = dirname;
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2163
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2164 dirlist = dirlist.sort (false);
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2165
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2166 octave_idx_type len = dirlist.numel ();
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2167
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2168 for (octave_idx_type i = 0; i < len; i++)
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2169 {
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2170 std::string elt = dirlist[i];
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2171
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2172 bool skip_p = (elt == "." \|\| elt == ".." \|\| elt[0] == '@'
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2173 \|\| elt[0] == '+');
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2174
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2175 if (! skip_p)
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2176 {
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2177 for (octave_idx_type j = 0; j < skip.numel (); j++)
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2178 {
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2179 skip_p = (elt == skip[j]);
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2180 if (skip_p)
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2181 break;
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2182 }
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2183
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2184 if (! skip_p)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2185 {
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2186 std::string nm = sys::file_ops::concat (dirname, elt);
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2187
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2188 sys::file_stat fs (nm);
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2189
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2190 if (fs && fs.is_dir ())
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	2191 retval += directory_path::path_sep_str () + genpath (nm, skip);
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2192 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2193 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2194 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2195
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2196 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2197 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2198 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2199
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2200 DEFUN (genpath, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2201 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2202 @deftypefn {} {} genpath (@var{dir})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2203 @deftypefnx {} {} genpath (@var{dir}, @var{skip}, @dots{})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2204 Return a path constructed from @var{dir} and all its subdirectories.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2205
24513 e61e26d1ede9 doc: Improve documentation for genpath(). Rik <rik@octave.org> parents: 24425 diff changeset	2206 The path does not include package directories (beginning with @samp{+}),
e61e26d1ede9 doc: Improve documentation for genpath(). Rik <rik@octave.org> parents: 24425 diff changeset	2207 old-style class directories (beginning with @samp{@@}), @file{private}
e61e26d1ede9 doc: Improve documentation for genpath(). Rik <rik@octave.org> parents: 24425 diff changeset	2208 directories, or any subdirectories of these types.
e61e26d1ede9 doc: Improve documentation for genpath(). Rik <rik@octave.org> parents: 24425 diff changeset	2209
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2210 If additional string parameters are given, the resulting path will exclude
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2211 directories with those names.
24513 e61e26d1ede9 doc: Improve documentation for genpath(). Rik <rik@octave.org> parents: 24425 diff changeset	2212 @seealso{path, addpath}
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2213 @end deftypefn */)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2214 {
20816 b16bcd7a2a33 Use int rather than octave_idx_type for nargin data type. Rik <rik@octave.org> parents: 20812 diff changeset	2215 int nargin = args.length ();
10971 386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2216
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2217 if (nargin == 0)
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2218 print_usage ();
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2219
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2220 octave_value retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2221
10971 386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2222 if (nargin == 1)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2223 {
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20581 diff changeset	2224 std::string dirname = args(0).xstring_value ("genpath: DIR must be a string");
20581 fd0efcdb3718 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	2225
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2226 retval = octave::genpath (dirname);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2227 }
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2228 else
10971 386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2229 {
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20581 diff changeset	2230 std::string dirname = args(0).xstring_value ("genpath: all arguments must be strings");
10971 386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2231
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2232 string_vector skip (nargin - 1);
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2233
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2234 for (octave_idx_type i = 1; i < nargin; i++)
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20581 diff changeset	2235 skip[i-1] = args(i).xstring_value ("genpath: all arguments must be strings");
20581 fd0efcdb3718 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	2236
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2237 retval = octave::genpath (dirname, skip);
10971 386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2238 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2239
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2240 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2241 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2242
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2243 DEFUN (rehash, , ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2244 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2245 @deftypefn {} {} rehash ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2246 Reinitialize Octave's load path directory cache.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2247 @end deftypefn */)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2248 {
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	2249 octave::rehash_internal ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2250
21078 49852ff04747 maint: Remove unnecessary declarations of retval. Rik <rik@octave.org> parents: 21021 diff changeset	2251 return ovl ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2252 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2253
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2254 DEFMETHOD (command_line_path, interp, args, ,
4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2255 doc: /* -- texinfo --
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2256 @deftypefn {} {} command_line_path ()
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2257 Return the command line path variable.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2258
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2259 @seealso{path, addpath, rmpath, genpath, pathdef, savepath, pathsep}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2260 @end deftypefn */)
8586 31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2261 {
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2262 if (! args.empty ())
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2263 print_usage ();
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2264
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2265 octave::load_path& lp = interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2266
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2267 return ovl (lp.get_command_line_path ());
8586 31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2268 }
31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2269
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2270 DEFMETHOD (restoredefaultpath, interp, args, ,
4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2271 doc: /* -- texinfo --
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2272 @deftypefn {} {} restoredefaultpath ()
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2273 Restore Octave's path to its initial state at startup.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2274
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2275 @seealso{path, addpath, rmpath, genpath, pathdef, savepath, pathsep}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2276 @end deftypefn */)
7391 f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2277 {
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2278 if (! args.empty ())
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2279 print_usage ();
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2280
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2281 octave::load_path& lp = interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2282
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2283 lp.initialize (true);
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2284
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2285 return ovl (lp.system_path ());
7391 f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2286 }
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2287
8812 7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8746 diff changeset	2288 // Return Octave's original default list of directories in which to
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8746 diff changeset	2289 // search for function files. This corresponds to the path that
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8746 diff changeset	2290 // exists prior to running the system's octaverc file or the user's
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8746 diff changeset	2291 // ~/.octaverc file
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8746 diff changeset	2292
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2293 DEFMETHOD (__pathorig__, interp, , ,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	2294 doc: /* -- texinfo --
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2295 @deftypefn {} {@var{val} =} __pathorig__ ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2296 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2297 @end deftypefn */)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2298 {
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2299 octave::load_path& lp = interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2300
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2301 return ovl (lp.system_path ());
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2302 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2303
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2304 DEFMETHOD (path, interp, args, nargout,
4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2305 doc: /* -- texinfo --
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2306 @deftypefn {} {} path ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2307 @deftypefnx {} {@var{str} =} path ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2308 @deftypefnx {} {@var{str} =} path (@var{path1}, @dots{})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2309 Modify or display Octave's load path.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2310
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2311 If @var{nargin} and @var{nargout} are zero, display the elements of
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2312 Octave's load path in an easy to read format.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2313
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2314 If @var{nargin} is zero and nargout is greater than zero, return the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2315 current load path.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2316
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2317 If @var{nargin} is greater than zero, concatenate the arguments,
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2318 separating them with @code{pathsep}. Set the internal search path
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2319 to the result and return it.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2320
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2321 No checks are made for duplicate elements.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2322 @seealso{addpath, rmpath, genpath, pathdef, savepath, pathsep}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2323 @end deftypefn */)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2324 {
20817 3d551b2ae928 Use variable name nargin consistently in C++ code. Rik <rik@octave.org> parents: 20816 diff changeset	2325 int nargin = args.length ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2326
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2327 string_vector argv = args.make_argv ("path");
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2328
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2329 octave::load_path& lp = interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2330
20817 3d551b2ae928 Use variable name nargin consistently in C++ code. Rik <rik@octave.org> parents: 20816 diff changeset	2331 if (nargin > 0)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2332 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2333 std::string path = argv[1];
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2334
20817 3d551b2ae928 Use variable name nargin consistently in C++ code. Rik <rik@octave.org> parents: 20816 diff changeset	2335 for (int i = 2; i <= nargin; i++)
21745 bf1121302404 use namespace for dir_path class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	2336 path += octave::directory_path::path_sep_str () + argv[i];
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2337
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2338 lp.set (path, true);
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2339
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	2340 octave::rehash_internal ();
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2341 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2342
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2343 if (nargout > 0)
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2344 return ovl (lp.path ());
20817 3d551b2ae928 Use variable name nargin consistently in C++ code. Rik <rik@octave.org> parents: 20816 diff changeset	2345 else if (nargin == 0 && nargout == 0)
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2346 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2347 octave_stdout <<
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2348 "\nOctave's search path contains the following directories:\n\n";
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2349
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2350 string_vector dirs = lp.dirs ();
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2351
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2352 dirs.list_in_columns (octave_stdout);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2353
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2354 octave_stdout << "\n";
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2355 }
20820 eed8ec05f1c8 always return value from DEFUN functions John W. Eaton <jwe@octave.org> parents: 20817 diff changeset	2356
21125 8f76684324b5 maint: change "return octave_value ()" to "return ovl ()". Rik <rik@octave.org> parents: 21078 diff changeset	2357 return ovl ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2358 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2359
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2360 DEFMETHOD (addpath, interp, args, nargout,
4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2361 doc: /* -- texinfo --
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2362 @deftypefn {} {} addpath (@var{dir1}, @dots{})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2363 @deftypefnx {} {} addpath (@var{dir1}, @dots{}, @var{option})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2364 Add named directories to the function search path.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2365
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2366 If @var{option} is @qcode{"-begin"} or 0 (the default), prepend the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2367 directory name to the current path. If @var{option} is @qcode{"-end"}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2368 or 1, append the directory name to the current path.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2369 Directories added to the path must exist.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2370
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2371 In addition to accepting individual directory arguments, lists of
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2372 directory names separated by @code{pathsep} are also accepted. For example:
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2373
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2374 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2375 addpath ("dir1:/dir2:~/dir3")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2376 @end example
22387 4e97eaf021e4 doc: add note about PKG_ADD/PKG_DEL to addpath and rmpath (bug #41885) Julien Bect <julien.bect@supelec.fr> parents: 22327 diff changeset	2377
4e97eaf021e4 doc: add note about PKG_ADD/PKG_DEL to addpath and rmpath (bug #41885) Julien Bect <julien.bect@supelec.fr> parents: 22327 diff changeset	2378 For each directory that is added, and that was not already in the path,
4e97eaf021e4 doc: add note about PKG_ADD/PKG_DEL to addpath and rmpath (bug #41885) Julien Bect <julien.bect@supelec.fr> parents: 22327 diff changeset	2379 @code{addpath} checks for the existence of a file named @file{PKG_ADD}
4e97eaf021e4 doc: add note about PKG_ADD/PKG_DEL to addpath and rmpath (bug #41885) Julien Bect <julien.bect@supelec.fr> parents: 22327 diff changeset	2380 (note lack of .m extension) and runs it if it exists.
4e97eaf021e4 doc: add note about PKG_ADD/PKG_DEL to addpath and rmpath (bug #41885) Julien Bect <julien.bect@supelec.fr> parents: 22327 diff changeset	2381
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2382 @seealso{path, rmpath, genpath, pathdef, savepath, pathsep}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2383 @end deftypefn */)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2384 {
21953 c46e2532d421 Add directories through addpath in the correct order (bug #48247). Rik <rik@octave.org> parents: 21745 diff changeset	2385 // Originally written by Bill Denney and Etienne Grossman.
c46e2532d421 Add directories through addpath in the correct order (bug #48247). Rik <rik@octave.org> parents: 21745 diff changeset	2386 // Heavily modified and translated to C++ by jwe.
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2387
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2388 int nargin = args.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2389
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2390 if (nargin == 0)
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2391 print_usage ();
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2392
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2393 octave::load_path& lp = interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2394
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2395 octave_value retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2396
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2397 if (nargout > 0)
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2398 retval = lp.path ();
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2399
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2400 bool append = false;
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2401
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2402 octave_value option_arg = args(nargin-1);
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2403
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2404 if (option_arg.is_string ())
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2405 {
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2406 std::string option = option_arg.string_value ();
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2407
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2408 if (option == "-end")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2409 {
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2410 append = true;
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2411 nargin--;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2412 }
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2413 else if (option == "-begin")
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2414 nargin--;
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2415 }
23586 f6c5db0a02e7 maint: Deprecate is_numeric_type and replace with isnumeric. Rik <rik@octave.org> parents: 23519 diff changeset	2416 else if (option_arg.isnumeric ())
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2417 {
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2418 int val = option_arg.xint_value ("addpath: OPTION must be '-begin'/0 or '-end'/1");
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2419
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2420 if (val == 0)
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2421 nargin--;
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2422 else if (val == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2423 {
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2424 append = true;
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2425 nargin--;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2426 }
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2427 else
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20820 diff changeset	2428 error ("addpath: OPTION must be '-begin'/0 or '-end'/1");
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2429 }
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2430
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2431 bool need_to_update = false;
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2432
21953 c46e2532d421 Add directories through addpath in the correct order (bug #48247). Rik <rik@octave.org> parents: 21745 diff changeset	2433 octave_value_list arglist (args.slice (0, nargin));
c46e2532d421 Add directories through addpath in the correct order (bug #48247). Rik <rik@octave.org> parents: 21745 diff changeset	2434 if (! append)
c46e2532d421 Add directories through addpath in the correct order (bug #48247). Rik <rik@octave.org> parents: 21745 diff changeset	2435 arglist.reverse ();
c46e2532d421 Add directories through addpath in the correct order (bug #48247). Rik <rik@octave.org> parents: 21745 diff changeset	2436
c46e2532d421 Add directories through addpath in the correct order (bug #48247). Rik <rik@octave.org> parents: 21745 diff changeset	2437 for (int i = 0; i < arglist.length (); i++)
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2438 {
21953 c46e2532d421 Add directories through addpath in the correct order (bug #48247). Rik <rik@octave.org> parents: 21745 diff changeset	2439 std::string arg = arglist(i).xstring_value ("addpath: all arguments must be strings");
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2440
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	2441 std::list<std::string> dir_elts = octave::split_path (arg);
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2442
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2443 if (! append)
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2444 std::reverse (dir_elts.begin (), dir_elts.end ());
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2445
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	2446 for (auto dir : dir_elts)
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2447 {
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	2448 // Remove duplicate directory separators
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	2449 auto it_start = dir.begin ();
24424 ceae837bc9ea Fix addpath for UNC paths on Windows (bug #51268). Markus Mützel <markus.muetzel@gmx.de> parents: 23219 diff changeset	2450 #if defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM)
ceae837bc9ea Fix addpath for UNC paths on Windows (bug #51268). Markus Mützel <markus.muetzel@gmx.de> parents: 23219 diff changeset	2451 // In Windows, start check at second character (for UNC paths).
ceae837bc9ea Fix addpath for UNC paths on Windows (bug #51268). Markus Mützel <markus.muetzel@gmx.de> parents: 23219 diff changeset	2452 it_start++;
ceae837bc9ea Fix addpath for UNC paths on Windows (bug #51268). Markus Mützel <markus.muetzel@gmx.de> parents: 23219 diff changeset	2453 #endif
25951 7a507e71d922 style fixes John W. Eaton <jwe@octave.org> parents: 25376 diff changeset	2454 dir.erase (std::unique
7a507e71d922 style fixes John W. Eaton <jwe@octave.org> parents: 25376 diff changeset	2455 (it_start, dir.end (),
7a507e71d922 style fixes John W. Eaton <jwe@octave.org> parents: 25376 diff changeset	2456 [] (char l, char r)
7a507e71d922 style fixes John W. Eaton <jwe@octave.org> parents: 25376 diff changeset	2457 {
7a507e71d922 style fixes John W. Eaton <jwe@octave.org> parents: 25376 diff changeset	2458 return l == r && octave::sys::file_ops::is_dir_sep (l);
7a507e71d922 style fixes John W. Eaton <jwe@octave.org> parents: 25376 diff changeset	2459 }),
21956 d5a58720459d addpath: Remove duplicate directory separators before adding path. Rik <rik@octave.org> parents: 21953 diff changeset	2460 dir.end ());
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2461
23994 8785b3717140 Issue a warning if addpath() called for a +pkg directory (bug #45410). Rik <rik@octave.org> parents: 23970 diff changeset	2462 auto pos = dir.find_last_of (octave::sys::file_ops::dir_sep_chars ());
8785b3717140 Issue a warning if addpath() called for a +pkg directory (bug #45410). Rik <rik@octave.org> parents: 23970 diff changeset	2463 if (pos == std::string::npos)
8785b3717140 Issue a warning if addpath() called for a +pkg directory (bug #45410). Rik <rik@octave.org> parents: 23970 diff changeset	2464 {
8785b3717140 Issue a warning if addpath() called for a +pkg directory (bug #45410). Rik <rik@octave.org> parents: 23970 diff changeset	2465 if (! dir.empty () && dir[0] == '+')
8785b3717140 Issue a warning if addpath() called for a +pkg directory (bug #45410). Rik <rik@octave.org> parents: 23970 diff changeset	2466 warning_with_id ("Octave:addpath-pkg",
8785b3717140 Issue a warning if addpath() called for a +pkg directory (bug #45410). Rik <rik@octave.org> parents: 23970 diff changeset	2467 "addpath: package directories should not be added to path: %s\n", dir.c_str ());
8785b3717140 Issue a warning if addpath() called for a +pkg directory (bug #45410). Rik <rik@octave.org> parents: 23970 diff changeset	2468 }
8785b3717140 Issue a warning if addpath() called for a +pkg directory (bug #45410). Rik <rik@octave.org> parents: 23970 diff changeset	2469 else
8785b3717140 Issue a warning if addpath() called for a +pkg directory (bug #45410). Rik <rik@octave.org> parents: 23970 diff changeset	2470 {
8785b3717140 Issue a warning if addpath() called for a +pkg directory (bug #45410). Rik <rik@octave.org> parents: 23970 diff changeset	2471 if (pos + 1 < dir.length () && dir[pos+1] == '+')
8785b3717140 Issue a warning if addpath() called for a +pkg directory (bug #45410). Rik <rik@octave.org> parents: 23970 diff changeset	2472 warning_with_id ("Octave:addpath-pkg",
8785b3717140 Issue a warning if addpath() called for a +pkg directory (bug #45410). Rik <rik@octave.org> parents: 23970 diff changeset	2473 "addpath: package directories should not be added to path: %s\n", dir.c_str ());
8785b3717140 Issue a warning if addpath() called for a +pkg directory (bug #45410). Rik <rik@octave.org> parents: 23970 diff changeset	2474 }
8785b3717140 Issue a warning if addpath() called for a +pkg directory (bug #45410). Rik <rik@octave.org> parents: 23970 diff changeset	2475
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2476 if (append)
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2477 lp.append (dir, true);
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2478 else
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2479 lp.prepend (dir, true);
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2480
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2481 need_to_update = true;
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2482 }
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2483 }
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2484
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2485 if (need_to_update)
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	2486 octave::rehash_internal ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2487
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2488 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2489 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2490
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2491 DEFMETHOD (rmpath, interp, args, nargout,
4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2492 doc: /* -- texinfo --
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2493 @deftypefn {} {} rmpath (@var{dir1}, @dots{})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2494 Remove @var{dir1}, @dots{} from the current function search path.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2495
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2496 In addition to accepting individual directory arguments, lists of
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2497 directory names separated by @code{pathsep} are also accepted. For example:
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2498
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2499 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2500 rmpath ("dir1:/dir2:~/dir3")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2501 @end example
22387 4e97eaf021e4 doc: add note about PKG_ADD/PKG_DEL to addpath and rmpath (bug #41885) Julien Bect <julien.bect@supelec.fr> parents: 22327 diff changeset	2502
4e97eaf021e4 doc: add note about PKG_ADD/PKG_DEL to addpath and rmpath (bug #41885) Julien Bect <julien.bect@supelec.fr> parents: 22327 diff changeset	2503 For each directory that is removed, @code{rmpath} checks for the
4e97eaf021e4 doc: add note about PKG_ADD/PKG_DEL to addpath and rmpath (bug #41885) Julien Bect <julien.bect@supelec.fr> parents: 22327 diff changeset	2504 existence of a file named @file{PKG_DEL} (note lack of .m extension)
4e97eaf021e4 doc: add note about PKG_ADD/PKG_DEL to addpath and rmpath (bug #41885) Julien Bect <julien.bect@supelec.fr> parents: 22327 diff changeset	2505 and runs it if it exists.
4e97eaf021e4 doc: add note about PKG_ADD/PKG_DEL to addpath and rmpath (bug #41885) Julien Bect <julien.bect@supelec.fr> parents: 22327 diff changeset	2506
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2507 @seealso{path, addpath, genpath, pathdef, savepath, pathsep}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2508 @end deftypefn */)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2509 {
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20803 diff changeset	2510 // Originally written by Etienne Grossmann. Heavily modified and translated
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2511 // to C++ by jwe.
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2512
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2513 int nargin = args.length ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2514
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2515 if (nargin == 0)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2516 print_usage ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2517
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2518 octave_value retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2519
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2520 octave::load_path& lp = interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2521
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2522 if (nargout > 0)
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2523 retval = lp.path ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2524
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2525 bool need_to_update = false;
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2526
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2527 for (int i = 0; i < nargin; i++)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2528 {
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2529 std::string arg = args(i).xstring_value ("rmpath: all arguments must be strings");
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	2530 std::list<std::string> dir_elts = octave::split_path (arg);
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2531
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	2532 for (const auto& dir : dir_elts)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2533 {
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2534 //dir = regexprep (dir_elts{j}, '//+', "/");
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2535 //dir = regexprep (dir, '/$', "");
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2536
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2537 if (! lp.remove (dir))
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2538 warning ("rmpath: %s: not found", dir.c_str ());
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2539 else
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2540 need_to_update = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2541 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2542 }
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2543
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2544 if (need_to_update)
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26970 diff changeset	2545 octave::rehash_internal ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2546
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2547 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2548 }
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16567 diff changeset	2549
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2550 DEFMETHOD (__dump_load_path__, interp, , ,
4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2551 doc: /* -- texinfo --
22299 9fc91bb2aec3 doc: grammarcheck documentation for 4.2 release. Rik <rik@octave.org> parents: 22094 diff changeset	2552 @deftypefn {} {} __dump_load_path__ ()
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2553 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2554 @end deftypefn */)
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16567 diff changeset	2555 {
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2556 octave::load_path& lp = interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2557
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2558 lp.display (octave_stdout);
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16567 diff changeset	2559
20941 a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()". Rik <rik@octave.org> parents: 20939 diff changeset	2560 return ovl ();
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16567 diff changeset	2561 }

Mercurial > octave

annotate libinterp/corefcn/load-path.cc @ 27101:097774bed4ed