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

annotate libinterp/corefcn/load-path.cc @ 23586:f6c5db0a02e7

maint: Deprecate is_numeric_type and replace with isnumeric. * ov.h (is_numeric_type): Use OCTAVE_DEPRECATED macro around function. * ov.h (isnumeric): New function. * make_int.cc, besselj.cc, cellfun.cc, data.cc, dot.cc, file-io.cc, graphics.cc, load-path.cc, lookup.cc, lu.cc, mex.cc, mgorth.cc, oct-hist.cc, pr-output.cc, schur.cc, sparse.cc, sqrtm.cc, sub2ind.cc, typecast.cc, utils.cc, chol.cc, qr.cc, ov-base-diag.h, ov-base-mat.h, ov-base-scalar.h, ov-base-sparse.h, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.h, ov-bool.h, ov-cell.h, ov-class.cc, ov-fcn-inline.cc, ov-lazy-idx.h, ov-perm.h, ov-range.h, ov-str-mat.h, ov-usr-fcn.cc, bp-table.cc: Replace instances of is_numeric_type with isnumeric.

author	Rik <rik@octave.org>
date	Tue, 13 Jun 2017 10:20:55 -0700
parents	4fe410bd918d
children	5cb3a2bb5e1e

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
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	3 Copyright (C) 2006-2017 John W. Eaton
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
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	8 Octave is free software; you can redistribute it and/or modify it
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
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	10 the Free Software Foundation; either version 3 of the License, or
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
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	20 <http://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"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	45 #include "unwind-prot.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	46 #include "utils.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	47
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	48 static void
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	49 maybe_add_path_elts (std::string& path, const std::string& dir)
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	50 {
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	51 std::string tpath = octave::genpath (dir);
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	52
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	53 if (! tpath.empty ())
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	54 {
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	55 if (path.empty ())
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	56 path = tpath;
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	57 else
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	58 path += octave::directory_path::path_sep_str () + tpath;
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	59 }
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	60 }
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	61
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	62 static std::list<std::string>
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	63 split_path (const std::string& p)
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	64 {
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	65 std::list<std::string> retval;
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	66
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	67 size_t beg = 0;
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	68 size_t end = p.find (octave::directory_path::path_sep_char ());
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	69
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	70 size_t len = p.length ();
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	71
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	72 while (end != std::string::npos)
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	73 {
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	74 std::string elt = p.substr (beg, end-beg);
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	75
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	76 if (! elt.empty ())
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	77 retval.push_back (elt);
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	78
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	79 beg = end + 1;
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	80
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	81 if (beg == len)
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	82 break;
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	83
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	84 end = p.find (octave::directory_path::path_sep_char (), beg);
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	85 }
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	86
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	87 std::string elt = p.substr (beg);
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	88
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	89 if (! elt.empty ())
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	90 retval.push_back (elt);
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	91
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	92 return retval;
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	93 }
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	94
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	95 // Strip trailing directory separators.
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	96
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	97 static std::string
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	98 strip_trailing_separators (const std::string& dir_arg)
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	99 {
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	100 std::string dir = dir_arg;
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	101
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	102 size_t k = dir.length ();
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	103
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	104 while (k > 1 && octave::sys::file_ops::is_dir_sep (dir[k-1]))
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	105 k--;
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	106
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	107 if (k < dir.length ())
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	108 dir.resize (k);
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	109
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	110 return dir;
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	111 }
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	112
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	113 // Should we cache all files in private directories, or is it OK to just
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	114 // look them up each time as needed?
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	115
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	116 static std::string
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	117 find_private_file (const std::string& fname)
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	118 {
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	119 std::string retval;
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	120
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	121 // Look in private directory corresponding to current function (if
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	122 // any).
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	123
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	124 octave_user_function *curr_fcn = symbol_table::get_curr_fcn ();
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	125
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	126 if (curr_fcn)
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	127 {
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	128 // Even for private functions, dir_name doesn't contain the
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	129 // "private" directory component so we append it here in all
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	130 // cases.
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	131
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	132 std::string dir_name = curr_fcn->dir_name ();
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	133
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	134 if (! dir_name.empty ())
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	135 {
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	136 std::string pfname = dir_name + octave::sys::file_ops::dir_sep_str ()
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	137 + "private" + octave::sys::file_ops::dir_sep_str () + fname;
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	138
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	139 octave::sys::file_stat fs (pfname);
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	140
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	141 if (fs.exists () && fs.is_reg ())
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	142 retval = pfname;
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	143 }
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	144 }
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	145
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	146 return retval;
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	147 }
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	148
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	149 static void
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	150 execute_pkg_add_or_del (const std::string& dir,
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	151 const std::string& script_file)
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	152 {
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	153 if (! octave_interpreter_ready)
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	154 return;
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	155
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	156 octave::unwind_protect frame;
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	157
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	158 std::string file = octave::sys::file_ops::concat (dir, script_file);
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	159
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	160 octave::sys::file_stat fs (file);
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	161
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	162 if (fs.exists ())
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	163 octave::source_file (file, "base");
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	164 }
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	165
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	166 // True if a path is contained in a path list separated by path_sep_char
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	167
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	168 static bool
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	169 in_path_list (const std::string& path_list, const std::string& path)
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	170 {
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	171 size_t ps = path.size ();
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	172 size_t pls = path_list.size ();
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	173 size_t pos = path_list.find (path);
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	174 char psc = octave::directory_path::path_sep_char ();
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	175 while (pos != std::string::npos)
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	176 {
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	177 if ((pos == 0 \|\| path_list[pos-1] == psc)
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	178 && (pos + ps == pls \|\| path_list[pos + ps] == psc))
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	179 return true;
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	180 else
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	181 pos = path_list.find (path, pos + 1);
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	182 }
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	183
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	184 return false;
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	185 }
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	186
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	187 static void
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	188 rehash_internal (void)
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	189 {
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	190 octave::load_path& lp = octave::__get_load_path__ ("rehash_internal");
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	191
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	192 lp.update ();
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	193
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	194 // FIXME: maybe we should rename this variable since it is being
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	195 // used for more than keeping track of the prompt time.
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	196
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	197 // This will force updated functions to be found.
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	198 Vlast_prompt_time.stamp ();
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	199 }
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	200
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	201 namespace octave
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	202 {
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	203 std::string load_path::sys_path;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	204 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	205
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	206 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	207 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	208 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	209 sys_path = "";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	210
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	211 if (set_initial_path)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	212 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	213 maybe_add_path_elts (sys_path, Vlocal_ver_oct_file_dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	214 maybe_add_path_elts (sys_path, Vlocal_api_oct_file_dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	215 maybe_add_path_elts (sys_path, Vlocal_oct_file_dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	216 maybe_add_path_elts (sys_path, Vlocal_ver_fcn_file_dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	217 maybe_add_path_elts (sys_path, Vlocal_api_fcn_file_dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	218 maybe_add_path_elts (sys_path, Vlocal_fcn_file_dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	219 maybe_add_path_elts (sys_path, Voct_file_dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	220 maybe_add_path_elts (sys_path, Vfcn_file_dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	221 maybe_add_path_elts (sys_path, Voct_data_dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	222 }
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 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	225
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	226 if (tpath.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	227 tpath = octave::sys::env::getenv ("OCTAVE_PATH");
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	228
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	229 std::string xpath;
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 if (! tpath.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	232 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	233 xpath = tpath;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	234
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	235 if (! sys_path.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	236 xpath += octave::directory_path::path_sep_str () + sys_path;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	237 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	238 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	239 xpath = sys_path;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	240
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	241 set (xpath, false, true);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	242 }
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 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	245 load_path::clear (void)
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 dir_info_list.clear ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	248
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	249 top_level_package.clear ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	250
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	251 package_map.clear ();
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	254 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	255 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	256 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	257 // 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	258 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	259
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	260 // 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	261 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	262
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	263 if (is_init)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	264 init_dirs = elts_set;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	265 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	266 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	267 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	268 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	269 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	270 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	271 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	272 "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	273 break;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	274 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	275 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	276 }
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 // Temporarily disable add hook.
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 octave::unwind_protect frame;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	281 frame.protect_var (add_hook);
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 add_hook = 0;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	284
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	285 clear ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	286
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	287 for (const auto& elt : elts)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	288 append (elt, warn);
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 // 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	291 frame.run_first ();
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 // 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	294 // 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	295 for (auto& di : dir_info_list)
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 if (add_hook)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	298 add_hook (di.dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	299 }
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 // Always prepend current directory.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	302 prepend (".", 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::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	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, true, 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 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	313 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	314 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	315 if (! dir.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	316 add (dir, false, warn);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	317 }
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 bool
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	320 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	321 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	322 bool retval = false;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	323
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	324 if (! dir_arg.empty ())
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 if (dir_arg == ".")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	327 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	328 warning ("rmpath: can't remove \".\" from path");
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 // Avoid additional warnings.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	331 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	332 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	333 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	334 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	335 std::string dir = octave::sys::file_ops::tilde_expand (dir_arg);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	336
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	337 dir = strip_trailing_separators (dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	338
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	339 dir_info_list_iterator i = find_dir_info (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 if (i != dir_info_list.end ())
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 retval = true;
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 if (remove_hook)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	346 remove_hook (dir);
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 dir_info& di = *i;
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 remove (di);
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 dir_info_list.erase (i);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	353 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	354 }
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	357 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	358 }
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 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	361 load_path::update (void) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	362 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	363 // 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	364 // 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	365 // have appeared.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	366
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	367 top_level_package.clear ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	368
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	369 package_map.clear ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	370
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	371 for (auto& di : dir_info_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	372 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	373 di.update ();
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 add (di, true, "", true);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	376 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	377 }
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	380 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	381 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	382 bool retval = false;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	383
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	384 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	385 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	386 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	387 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	388 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	389 break;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	390 }
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 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	394 }
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>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	397 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	398 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	399 std::list<std::string> retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	400
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	401 // update ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	402
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	403 top_level_package.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 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	406 nm_ldr.second.overloads (meth, retval);
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 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	409 }
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>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	412 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	413 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	414 std::list<std::string> retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	415
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	416 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	417 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	418 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	419 retval.push_back (dir_ldr.first);
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 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	423 }
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	426 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	427 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	428 std::string retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	429
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	430 if (octave::sys::env::absolute_pathname (file)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	431 \|\| octave::sys::env::rooted_relative_pathname (file))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	432 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	433 octave::sys::file_stat fs (file);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	434
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	435 return fs.exists () ? file : retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	436 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	437 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	438 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	439 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	440
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	441 if (! tfile.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	442 return tfile;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	443 }
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 if (file.find_first_of (octave::sys::file_ops::dir_sep_chars ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	446 != std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	447 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	448 // 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	449 // 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	450 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	451 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	452 std::string tfile = octave::sys::file_ops::concat (di.dir_name, file);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	453
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	454 octave::sys::file_stat fs (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 if (fs.exists ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	457 return tfile;
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 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	460 else
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 // Look in cache.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	463 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	464 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	465 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	466
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	467 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	468
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	469 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	470 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	471 if (all_files[i] == file)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	472 return octave::sys::file_ops::concat (di.dir_name, file);
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 }
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 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	478 }
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	481 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	482 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	483 std::string retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	484
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	485 if (dir.find_first_of (octave::sys::file_ops::dir_sep_chars ()) != std::string::npos
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	486 && (octave::sys::env::absolute_pathname (dir)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	487 \|\| octave::sys::env::rooted_relative_pathname (dir)))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	488 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	489 octave::sys::file_stat fs (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 if (fs.exists () && fs.is_dir ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	492 return dir;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	493 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	494 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	495 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	496 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	497 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	498 std::string dname = octave::sys::env::make_absolute (di.dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	499
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	500 size_t dname_len = dname.length ();
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 if (dname.substr (dname_len - 1)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	503 == octave::sys::file_ops::dir_sep_str ())
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 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	506 dname_len--;
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	509 size_t dir_len = dir.length ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	510
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	511 if (dname_len > dir_len
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	512 && octave::sys::file_ops::is_dir_sep (dname[dname_len - dir_len - 1])
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	513 && 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	514 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	515 octave::sys::file_stat fs (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 if (fs.exists () && fs.is_dir ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	518 return di.dir_name;
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 }
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 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	524 }
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 string_vector
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	527 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	528 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	529 std::list<std::string> retlist;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	530
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	531 if (dir.find_first_of (octave::sys::file_ops::dir_sep_chars ()) != std::string::npos
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	532 && (octave::sys::env::absolute_pathname (dir)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	533 \|\| octave::sys::env::rooted_relative_pathname (dir)))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	534 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	535 octave::sys::file_stat fs (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 if (fs.exists () && fs.is_dir ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	538 retlist.push_back (dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	539 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	540 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	541 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	542 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	543 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	544 std::string dname = octave::sys::env::make_absolute (di.dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	545
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	546 size_t dname_len = dname.length ();
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 if (dname.substr (dname_len - 1)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	549 == octave::sys::file_ops::dir_sep_str ())
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 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	552 dname_len--;
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	555 size_t dir_len = dir.length ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	556
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	557 if (dname_len > dir_len
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	558 && octave::sys::file_ops::is_dir_sep (dname[dname_len - dir_len - 1])
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	559 && 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	560 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	561 octave::sys::file_stat fs (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 if (fs.exists () && fs.is_dir ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	564 retlist.push_back (di.dir_name);
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 }
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 return retlist;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	570 }
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	573 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	574 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	575 std::string retval;
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 std::string dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	578 std::string file_name;
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 octave_idx_type flen = flist.numel ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	581 octave_idx_type rel_flen = 0;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	582
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	583 string_vector rel_flist (flen);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	584
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	585 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	586 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	587 std::string file = flist[i];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	588
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	589 if (file.find_first_of (octave::sys::file_ops::dir_sep_chars ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	590 != std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	591 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	592 if (octave::sys::env::absolute_pathname (file)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	593 \|\| octave::sys::env::rooted_relative_pathname (file))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	594 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	595 octave::sys::file_stat fs (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 if (fs.exists ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	598 return file;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	599 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	600 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	601 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	602 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	603 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	604 std::string tfile;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	605 tfile = octave::sys::file_ops::concat (di.dir_name, file);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	606
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	607 octave::sys::file_stat fs (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 if (fs.exists ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	610 return tfile;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	611 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	612 }
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 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	615 rel_flist[rel_flen++] = file;
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	618 rel_flist.resize (rel_flen);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	619
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	620 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	621 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	622 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	623
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	624 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	625
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	626 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	627 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	628 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	629 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	630 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	631 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	632 dir_name = di.dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	633 file_name = rel_flist[j];
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 goto done;
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 }
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	641 done:
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 if (! dir_name.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	644 retval = octave::sys::file_ops::concat (dir_name, file_name);
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 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	647 }
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 string_vector
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	650 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	651 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	652 std::list<std::string> retlist;
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 std::string dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	655 std::string file_name;
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 octave_idx_type flen = flist.numel ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	658 octave_idx_type rel_flen = 0;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	659
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	660 string_vector rel_flist (flen);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	661
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	662 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	663 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	664 std::string file = flist[i];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	665
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	666 if (file.find_first_of (octave::sys::file_ops::dir_sep_chars ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	667 != std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	668 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	669 if (octave::sys::env::absolute_pathname (file)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	670 \|\| octave::sys::env::rooted_relative_pathname (file))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	671 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	672 octave::sys::file_stat fs (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 if (fs.exists ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	675 retlist.push_back (file);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	676 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	677 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	678 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	679 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	680 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	681 std::string tfile;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	682 tfile = octave::sys::file_ops::concat (di.dir_name, file);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	683
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	684 octave::sys::file_stat fs (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 if (fs.exists ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	687 retlist.push_back (tfile);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	688 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	689 }
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 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	692 rel_flist[rel_flen++] = file;
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	695 rel_flist.resize (rel_flen);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	696
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	697 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	698 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	699 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	700
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	701 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	702
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	703 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	704 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	705 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	706 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	707 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	708 retlist.push_back (octave::sys::file_ops::concat (di.dir_name,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	709 rel_flist[j]));
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 }
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 return retlist;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	715 }
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 string_vector
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	718 load_path::dirs (void) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	719 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	720 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	721
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	722 string_vector retval (len);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	723
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	724 octave_idx_type k = 0;
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 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	727 retval[k++] = di.dir_name;
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 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	730 }
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>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	733 load_path::dir_list (void) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	734 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	735 std::list<std::string> retval;
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 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	738 retval.push_back (di.dir_name);
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 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	741 }
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	744 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	745 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	746 string_vector retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	747
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	748 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	749
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	750 if (p != dir_info_list.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	751 retval = p->fcn_files;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	752
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	753 if (omit_exts)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	754 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	755 octave_idx_type len = retval.numel ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	756
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	757 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	758 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	759 std::string fname = retval[i];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	760
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	761 size_t pos = fname.rfind ('.');
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 if (pos != std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	764 retval[i] = fname.substr (0, pos);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	765 }
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 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	769 }
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 string_vector
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	772 load_path::fcn_names (void) const
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 return top_level_package.fcn_names ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	775 }
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	778 load_path::path (void) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	779 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	780 std::string xpath;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	781
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	782 string_vector xdirs = load_path::dirs ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	783
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	784 octave_idx_type len = xdirs.numel ();
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 if (len > 0)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	787 xpath = xdirs[0];
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 for (octave_idx_type i = 1; i < len; i++)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	790 xpath += octave::directory_path::path_sep_str () + xdirs[i];
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 return xpath;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	793 }
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 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	796 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	797 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	798 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	799 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	800 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	801
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	802 if (! fcn_files.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	803 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	804 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	805
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	806 fcn_files.list_in_columns (os);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	807 }
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 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	810 = di.method_file_map;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	811
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	812 if (! method_file_map.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	813 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	814 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	815 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	816 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	817 << "/@" << cls_ci.first << ":\n\n";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	818
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	819 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	820
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	821 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	822
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	823 method_files.list_in_columns (os);
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 }
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	828 top_level_package.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 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	831 nm_ldr.second.display (os);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	832 }
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 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	835 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	836 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	837 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	838 }
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 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	841 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	842 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	843 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	844 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	845
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	846 // 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	847
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	848 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	849 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	850 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	851 std::string dir = octave::sys::file_ops::tilde_expand (dir_arg);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	852
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	853 const_dir_info_list_iterator retval = dir_info_list.begin ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	854
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	855 while (retval != dir_info_list.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	856 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	857 if (retval->dir_name == dir)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	858 break;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	859
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	860 retval++;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	861 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	862
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	863 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	864 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	865
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	866 load_path::dir_info_list_iterator
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	867 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	868 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	869 std::string dir = octave::sys::file_ops::tilde_expand (dir_arg);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	870
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	871 dir_info_list_iterator retval = dir_info_list.begin ();
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 while (retval != dir_info_list.end ())
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 if (retval->dir_name == dir)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	876 break;
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 retval++;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	879 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	880
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	881 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	882 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	883
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	884 bool
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	885 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	886 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	887 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	888 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	889
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	890 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	891 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	892 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	893 if (dir_info_list.size () > 1)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	894 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	895 dir_info di = *i;
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 dir_info_list.erase (i);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	898
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	899 if (at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	900 dir_info_list.push_back (di);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	901 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	902 dir_info_list.push_front (di);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	903
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	904 move (di, 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 }
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 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	909 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	910 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	911 package_info& l = get_package (pname);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	912
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	913 l.move (di, at_end);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	914
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	915 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	916
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	917 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	918 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	919 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	920
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	921 if (! pname.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	922 full_name = pname + "." + full_name;
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 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	925 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	926 }
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 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	929 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	930 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	931 size_t len = dir_arg.length ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	932
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	933 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	934 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	935 "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	936
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	937 std::string dir = octave::sys::file_ops::tilde_expand (dir_arg);
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 dir = strip_trailing_separators (dir);
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 dir_info_list_iterator i = find_dir_info (dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	942
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	943 if (i != dir_info_list.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	944 move (i, at_end);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	945 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	946 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	947 octave::sys::file_stat fs (dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	948
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	949 if (fs)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	950 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	951 if (fs.is_dir ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	952 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	953 dir_info di (dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	954
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	955 if (at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	956 dir_info_list.push_back (di);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	957 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	958 dir_info_list.push_front (di);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	959
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	960 add (di, at_end);
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 (add_hook)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	963 add_hook (dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	964 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	965 else if (warn)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	966 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	967 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	968 else if (warn)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	969 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	970 std::string msg = fs.error ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	971 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	972 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	973 }
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 // 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	976
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	977 i = find_dir_info (".");
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	978
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	979 if (i != dir_info_list.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	980 move (i, false);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	981 }
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 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	984 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	985 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	986 package_info& l = get_package (pname);
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 l.remove (di);
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 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	991
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	992 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	993 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	994 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	995
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	996 if (! pname.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	997 full_name = pname + "." + full_name;
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 remove (pkg_di.second, full_name);
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 }
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 bool
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1004 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	1005 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1006 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	1007 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1008 if (di.is_package (name))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1009 return true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1010 }
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 return false;
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 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1016 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	1017 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	1018 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1019 package_info& l = get_package (pname);
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 l.add (di, at_end, updating);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1022
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1023 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	1024
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1025 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	1026 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1027 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	1028
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1029 if (! pname.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1030 full_name = pname + "." + full_name;
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 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	1033 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1034 }
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 string_vector
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1037 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	1038 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1039 octave_idx_type n = lst.size ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1040
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1041 string_vector retval (n);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1042
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1043 octave_idx_type count = 0;
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 for (const auto& nm_typ : lst)
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 std::string nm = nm_typ.first;
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 int types = nm_typ.second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1050
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1051 if (types & load_path::OCT_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1052 nm += ".oct";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1053 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	1054 nm += ".mex";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1055 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1056 nm += ".m";
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 retval[count++] = nm;
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1061 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1062 }
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 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	1065 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	1066 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1067 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	1068
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1069 octave::sys::dir_entry dir (d);
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 if (dir)
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 string_vector flist = dir.read ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1074
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1075 octave_idx_type len = flist.numel ();
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 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	1078 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1079 std::string fname = flist[i];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1080
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1081 size_t pos = fname.rfind ('.');
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1082
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1083 if (pos != std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1084 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1085 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	1086 std::string ext = fname.substr (pos);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1087
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1088 if (valid_identifier (base))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1089 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1090 int t = 0;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1091
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1092 if (ext == ".m")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1093 t = load_path::M_FILE;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1094 else if (ext == ".oct")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1095 t = load_path::OCT_FILE;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1096 else if (ext == ".mex")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1097 t = load_path::MEX_FILE;
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 if (t)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1100 retval[base] = t;
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 }
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 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1105 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1106 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1107 std::string msg = dir.error ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1108 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	1109 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1110
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1111 return retval;
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1114 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1115 load_path::dir_info::update (void)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1116 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1117 octave::sys::file_stat fs (dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1118
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1119 if (! fs)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1120 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1121 std::string msg = fs.error ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1122 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	1123 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1124 else
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 if (is_relative)
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 try
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 std::string abs_name = octave::sys::env::make_absolute (dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1131
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1132 const_abs_dir_cache_iterator p = abs_dir_cache.find (abs_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1133
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1134 if (p != abs_dir_cache.end ())
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 // The directory is in the cache of all directories we have
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1137 // visited (indexed by absolute name). If it is out of date,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1138 // initialize it. Otherwise, copy the info from the cache.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1139 // By doing that, we avoid unnecessary calls to stat that can
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1140 // slow things down tremendously for large directories.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1141 const dir_info& di = p->second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1142
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1143 if (fs.mtime () + fs.time_resolution ()
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1144 > di.dir_time_last_checked)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1145 initialize ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1146 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1147 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1148 // Copy over info from cache, but leave dir_name and
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1149 // is_relative unmodified.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1150 this->abs_dir_name = di.abs_dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1151 this->dir_mtime = di.dir_mtime;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1152 this->dir_time_last_checked = di.dir_time_last_checked;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1153 this->all_files = di.all_files;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1154 this->fcn_files = di.fcn_files;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1155 this->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	1156 this->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	1157 this->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	1158 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1159 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1160 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1161 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1162 // We haven't seen this directory before.
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1163 initialize ();
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1164 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1165 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1166 catch (const octave::execution_exception&)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1167 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1168 // Skip updating if we don't know where we are,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1169 // but don't treat it as an error.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1170 octave::interpreter::recover_from_exception ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1171 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1172 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1173 // Absolute path, check timestamp to see whether it requires re-caching
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1174 else if (fs.mtime () + fs.time_resolution () > dir_time_last_checked)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1175 initialize ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1176 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1177 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1178
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1179 bool
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1180 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	1181 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1182 size_t pos = name.find ('.');
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1183
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1184 if (pos == std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1185 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	1186 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1187 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1188 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	1189 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	1190
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1191 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	1192
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1193 if (it != package_dir_map.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1194 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	1195 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1196 return false;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1197 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1198 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1199
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1200 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1201 load_path::dir_info::initialize (void)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1202 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1203 is_relative = ! octave::sys::env::absolute_pathname (dir_name);
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 dir_time_last_checked = octave::sys::time (static_cast<time_t> (0));
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1206
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1207 octave::sys::file_stat fs (dir_name);
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 if (fs)
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 method_file_map.clear ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1212 package_dir_map.clear ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1213
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1214 dir_mtime = fs.mtime ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1215 dir_time_last_checked = octave::sys::time ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1216
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1217 get_file_list (dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1218
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1219 try
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1220 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1221 std::string abs_name = octave::sys::env::make_absolute (dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1222
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1223 // FIXME: nothing is ever removed from this cache of
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1224 // directory information, so there could be some resource
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1225 // problems. Perhaps it should be pruned from time to time.
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 abs_dir_cache[abs_name] = *this;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1228 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1229 catch (const octave::execution_exception&)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1230 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1231 // Skip updating if we don't know where we are but don't treat
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1232 // it as an error.
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1233
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1234 octave::interpreter::recover_from_exception ();
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 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1237 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1238 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1239 std::string msg = fs.error ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1240 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	1241 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1242 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1243
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1244 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1245 load_path::dir_info::get_file_list (const std::string& d)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1246 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1247 octave::sys::dir_entry dir (d);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1248
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1249 if (dir)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1250 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1251 string_vector flist = dir.read ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1252
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1253 octave_idx_type len = flist.numel ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1254
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1255 all_files.resize (len);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1256 fcn_files.resize (len);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1257
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1258 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	1259 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	1260
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1261 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	1262 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1263 std::string fname = flist[i];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1264
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1265 std::string full_name = octave::sys::file_ops::concat (d, fname);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1266
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1267 octave::sys::file_stat fs (full_name);
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 if (fs)
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 if (fs.is_dir ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1272 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1273 if (fname == "private")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1274 get_private_file_map (full_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1275 else if (fname[0] == '@')
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1276 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	1277 else if (fname[0] == '+')
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1278 get_package_dir (full_name, fname.substr (1));
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 else
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[all_files_count++] = fname;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1283
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1284 size_t pos = fname.rfind ('.');
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1285
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1286 if (pos != std::string::npos)
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 std::string ext = fname.substr (pos);
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 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	1291 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1292 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	1293
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1294 if (valid_identifier (base))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1295 fcn_files[fcn_files_count++] = fname;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1296 }
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 }
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 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1301
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1302 all_files.resize (all_files_count);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1303 fcn_files.resize (fcn_files_count);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1304 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1305 else
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 std::string msg = dir.error ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1308 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	1309 }
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1312 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1313 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	1314 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1315 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	1316 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1317
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1318 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1319 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	1320 const std::string& class_name)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1321 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1322 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	1323
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1324 std::string pd = octave::sys::file_ops::concat (d, "private");
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 octave::sys::file_stat fs (pd);
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 if (fs && fs.is_dir ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1329 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	1330 }
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 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1333 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	1334 const std::string& package_name)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1335 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1336 package_dir_map[package_name] = dir_info (d);
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::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	1341 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1342 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	1343
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1344 std::list<std::string>::iterator s =
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1345 std::find (dir_list.begin (), dir_list.end (), dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1346
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1347 if (s != dir_list.end ())
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 dir_list.erase (s);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1350
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1351 if (at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1352 dir_list.push_back (dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1353 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1354 dir_list.push_front (dir_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1355 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1356
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1357 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	1358
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1359 // 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	1360
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1361 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	1362 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1363
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1364 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1365 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	1366 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1367 std::string dir = di.dir_name;
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 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	1370
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1371 dir_list.remove (dir);
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 remove_fcn_map (dir, fcn_files);
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 remove_private_fcn_map (dir);
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 remove_method_map (dir);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1378 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1379
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1380 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1381 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	1382 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1383 os << "*** package_info: "
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1384 << (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	1385 << "\n\n";
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 for (const auto& dir : dir_list)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1388 os << dir << "\n";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1389 os << "\n";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1390
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1391 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	1392 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1393 os << "\n*** private functions in "
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1394 << octave::sys::file_ops::concat (dir_fnlst.first, "private")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1395 << ":\n\n";
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 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	1398 }
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	1399
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	1400 #if defined (DEBUG_LOAD_PATH)
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	1401
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1402 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	1403 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1404 os << nm_filst.first << ":\n";
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 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	1407
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1408 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	1409 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1410 os << " " << finfo.dir_name << " (";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1411
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1412 print_types (os, finfo.types);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1413
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1414 os << ")\n";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1415 }
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1418 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	1419 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1420 os << "CLASS " << cls_fnmap.first << ":\n";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1421
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1422 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	1423
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1424 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	1425 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1426 os << " " << nm_fnlst.first << ":\n";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1427
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1428 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	1429
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1430 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	1431 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1432 os << " " << finfo.dir_name << " (";
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 print_types (os, finfo.types);
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 << ")\n";
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 }
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1441 os << "\n";
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	1442
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	1443 #endif
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1444 }
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 std::string
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1447 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	1448 std::string& dir_name,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1449 int type) const
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1450 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1451 std::string retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1452
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1453 // update ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1454
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1455 if (fcn.length () > 0 && fcn[0] == '@')
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1456 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1457 size_t pos = fcn.find ('/');
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1458
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1459 if (pos != std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1460 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1461 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	1462 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	1463
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1464 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	1465 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1466 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1467 retval = "";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1468 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1469 else
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 dir_name = "";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1472
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1473 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	1474
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1475 if (p != fcn_map.end ())
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 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	1478
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1479 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	1480 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1481 retval = octave::sys::file_ops::concat (fi.dir_name, fcn);
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 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	1484 fcn, "load_path::find_fcn"))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1485 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1486 dir_name = fi.dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1487 break;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1488 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1489 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1490 retval = "";
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 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1493 }
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 return retval;
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1498 std::string
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1499 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	1500 const std::string& fcn,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1501 int type) const
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 std::string retval;
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 // update ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1506
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1507 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	1508
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1509 if (q != private_fcn_map.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1510 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1511 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	1512
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1513 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	1514
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1515 if (p != m.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1516 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1517 std::string fname
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1518 = octave::sys::file_ops::concat (octave::sys::file_ops::concat (dir, "private"), fcn);
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 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	1521 "load_path::find_private_fcn"))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1522 retval = fname;
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 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1525
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1526 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1527 }
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1530 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	1531 const std::string& meth,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1532 std::string& dir_name,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1533 int type) const
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 std::string retval;
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 // update ();
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_name = "";
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 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	1542
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1543 if (q != method_map.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1544 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1545 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	1546
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1547 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	1548
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1549 if (p != m.end ())
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 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	1552
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1553 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	1554 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1555 retval = octave::sys::file_ops::concat (fi.dir_name, meth);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1556
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1557 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	1558 meth, "load_path::find_method");
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1559
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1560 if (found)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1561 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1562 dir_name = fi.dir_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1563 break;
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 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1566 retval = "";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1567 }
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 }
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 return retval;
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1574 std::list<std::string>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1575 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	1576 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1577 std::list<std::string> retval;
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 // update ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1580
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1581 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	1582
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1583 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	1584 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1585 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	1586 retval.push_back (nm_filst.first);
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1589 if (! retval.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1590 retval.sort ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1591
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1592 return 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 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1596 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	1597 std::list<std::string>& l) const
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 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	1600 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1601 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	1602
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1603 if (m.find (meth) != m.end ())
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 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	1606
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1607 if (! m_package_name.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1608 class_name = m_package_name + "." + class_name;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1609
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1610 l.push_back (class_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1611 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1612 }
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 string_vector
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1616 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	1617 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1618 size_t len = fcn_map.size ();
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 string_vector retval (len);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1621
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1622 octave_idx_type count = 0;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1623
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1624 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	1625 retval[count++] = nm_filst.first;
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 return retval;
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1630 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1631 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	1632 bool at_end, bool updating)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1633 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1634 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	1635
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1636 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	1637
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1638 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	1639
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1640 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	1641 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1642 std::string fname = fcn_files[i];
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 std::string ext;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1645 std::string base = fname;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1646
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1647 size_t pos = fname.rfind ('.');
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1648
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1649 if (pos != std::string::npos)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1650 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1651 base = fname.substr (0, pos);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1652 ext = fname.substr (pos);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1653 }
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 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	1656
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1657 file_info_list_iterator p = file_info_list.begin ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1658
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1659 while (p != file_info_list.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1660 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1661 if (p->dir_name == dir_name)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1662 break;
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 p++;
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1667 int t = 0;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1668 if (ext == ".m")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1669 t = load_path::M_FILE;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1670 else if (ext == ".oct")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1671 t = load_path::OCT_FILE;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1672 else if (ext == ".mex")
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1673 t = load_path::MEX_FILE;
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 (p == file_info_list.end ())
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 // 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	1678 // 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	1679
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1680 if (! updating)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1681 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1682 if (file_info_list.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1683 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1684 if (symbol_table::is_built_in_function_name (base))
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1685 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1686 std::string fcn_path = octave::sys::file_ops::concat (dir_name, fname);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1687
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1688 warning_with_id ("Octave:shadowed-function",
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1689 "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	1690 fcn_path.c_str ());
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 else if (! at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1694 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1695 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	1696
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1697 // 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	1698 // 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	1699 // partial matches?
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 // 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	1702 // 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	1703
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1704 if (fname != "Contents.m"
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1705 && 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	1706 && 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	1707 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1708 std::string fcn_path = octave::sys::file_ops::concat (dir_name, fname);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1709
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1710 warning_with_id ("Octave:shadowed-function",
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1711 "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	1712 fcn_path.c_str ());
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1713 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1714 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1715 }
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 file_info fi (dir_name, t);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1718
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1719 if (at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1720 file_info_list.push_back (fi);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1721 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1722 file_info_list.push_front (fi);
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 else
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 file_info& fi = *p;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1727
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1728 fi.types \|= t;
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 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1731 }
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 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1734 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	1735 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1736 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	1737
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1738 if (! private_file_map.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1739 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	1740 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1741
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1742 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1743 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	1744 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1745 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	1746
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1747 // <CLASS_NAME, CLASS_INFO>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1748 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	1749
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1750 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	1751 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1752 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	1753
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1754 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	1755
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1756 std::string full_dir_name
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1757 = octave::sys::file_ops::concat (dir_name, "@" + class_name);
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 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	1760
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1761 // <FCN_NAME, TYPES>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1762 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	1763
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1764 for (const auto& nm_typ : m)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1765 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1766 std::string base = nm_typ.first;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1767 int types = nm_typ.second;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1768
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1769 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	1770
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1771 file_info_list_iterator p2 = file_info_list.begin ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1772 while (p2 != file_info_list.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 if (p2->dir_name == full_dir_name)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1775 break;
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1776
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1777 p2++;
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1780 if (p2 == file_info_list.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1781 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1782 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	1783
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1784 if (at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1785 file_info_list.push_back (fi);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1786 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1787 file_info_list.push_front (fi);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1788 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1789 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1790 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1791 // FIXME: is this possible?
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1792 file_info& fi = *p2;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1793
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1794 fi.types = types;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1795 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1796 }
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 // <FCN_NAME, TYPES>
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1799 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	1800
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1801 if (! private_file_map.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1802 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	1803 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1804 }
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 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1807 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	1808 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	1809 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1810 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	1811
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1812 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	1813 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1814 std::string fname = fcn_files[k];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1815
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1816 std::string ext;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1817 std::string base = fname;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1818
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1819 size_t pos = fname.rfind ('.');
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1820
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1821 if (pos != std::string::npos)
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 base = fname.substr (0, pos);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1824 ext = fname.substr (pos);
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 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	1828
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1829 if (file_info_list.size () == 1)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1830 continue;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1831 else
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 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	1834 fi_it != file_info_list.end ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1835 fi_it++)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1836 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1837 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	1838 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1839 file_info fi_tmp = *fi_it;
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 file_info_list.erase (fi_it);
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 if (at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1844 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	1845 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1846 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	1847
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1848 break;
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 }
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 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1853 }
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 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1856 load_path::package_info::move_method_map (const std::string& dir_name, bool at_end)
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 for (auto& cls_fnmap : method_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1859 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1860 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	1861
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1862 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	1863
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1864 std::string full_dir_name
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1865 = octave::sys::file_ops::concat (dir_name, "@" + class_name);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1866
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1867 for (auto& nm_filst : fn_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1868 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1869 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	1870
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1871 if (file_info_list.size () == 1)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1872 continue;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1873 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1874 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1875 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	1876 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	1877 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1878 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	1879 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1880 file_info fi_tmp = *fi_it;
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 file_info_list.erase (fi_it);
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 if (at_end)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1885 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	1886 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1887 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	1888
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1889 break;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1890 }
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 }
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 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1895 }
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 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1898 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	1899 const string_vector& fcn_files)
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 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	1902
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1903 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	1904 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1905 std::string fname = fcn_files[k];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1906
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1907 std::string ext;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1908 std::string base = fname;
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 size_t pos = fname.rfind ('.');
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 if (pos != std::string::npos)
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 base = fname.substr (0, pos);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1915 ext = fname.substr (pos);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1916 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1917
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1918 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	1919
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1920 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	1921 fi_it != file_info_list.end ();
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1922 fi_it++)
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 if (fi_it->dir_name == dir)
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 file_info_list.erase (fi_it);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1927
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1928 if (file_info_list.empty ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1929 fcn_map.erase (fname);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1930
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1931 break;
23445 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 }
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 }
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 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1938 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	1939 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1940 private_fcn_map_iterator p = private_fcn_map.find (dir);
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 (p != private_fcn_map.end ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1943 private_fcn_map.erase (p);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1944 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1945
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1946 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1947 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	1948 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1949 for (auto& cls_fnmap : method_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1950 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1951 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	1952
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1953 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	1954
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1955 std::string full_dir_name
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1956 = octave::sys::file_ops::concat (dir, "@" + class_name);
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 for (auto& nm_filst : fn_map)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1959 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1960 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	1961
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1962 if (file_info_list.size () == 1)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1963 continue;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1964 else
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 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	1967 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	1968 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1969 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	1970 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1971 file_info_list.erase (fi_it);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1972 // 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	1973 // 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	1974 // 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	1975
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1976 break;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1977 }
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 }
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 }
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1984 bool
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1985 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	1986 int possible_types,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1987 const std::string& fcn,
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1988 const char *who) const
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 bool retval = false;
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 (type == load_path::OCT_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1993 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1994 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	1995 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1996 fname += ".oct";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1997 retval = true;
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 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2000 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	2001 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2002 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	2003 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2004 fname += ".m";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2005 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2006 }
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 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	2009 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2010 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	2011 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2012 fname += ".mex";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2013 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2014 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2015 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2016 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	2017 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2018 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	2019 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2020 fname += ".oct";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2021 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2022 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2023 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	2024 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2025 fname += ".m";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2026 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2027 }
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 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	2030 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2031 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	2032 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2033 fname += ".mex";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2034 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2035 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2036 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	2037 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2038 fname += ".m";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2039 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2040 }
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 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	2043 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2044 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	2045 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2046 fname += ".oct";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2047 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2048 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2049 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	2050 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2051 fname += ".mex";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2052 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2053 }
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 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	2056 \| load_path::MEX_FILE))
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 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	2059 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2060 fname += ".oct";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2061 retval = true;
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 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	2064 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2065 fname += ".mex";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2066 retval = true;
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 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	2069 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2070 fname += ".m";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2071 retval = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2072 }
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 else
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2075 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	2076
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2077 return retval;
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2080 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2081 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	2082 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2083 bool printed_type = false;
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 if (types & load_path::OCT_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2086 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2087 os << "oct";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2088 printed_type = true;
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2091 if (types & load_path::MEX_FILE)
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 if (printed_type)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2094 os << "\|";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2095 os << "mex";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2096 printed_type = 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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2099 if (types & load_path::M_FILE)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2100 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2101 if (printed_type)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2102 os << "\|";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2103 os << "m";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2104 printed_type = true;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2105 }
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2108 void
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2109 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	2110 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	2111 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2112 for (const auto& nm_typ : lst)
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2113 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2114 os << " " << nm_typ.first << " (";
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2115
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2116 print_types (os, nm_typ.second);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2117
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2118 os << ")\n";
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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2122 std::string
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2123 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	2124 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2125 std::string retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2126
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2127 octave::sys::dir_entry dir (dirname);
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 (dir)
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 retval = dirname;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2132
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2133 string_vector dirlist = dir.read ().sort (false);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2134
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2135 octave_idx_type len = dirlist.numel ();
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 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	2138 {
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2139 std::string elt = dirlist[i];
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2140
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2141 bool skip_p = (elt == "." \|\| elt == ".." \|\| elt[0] == '@'
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2142 \|\| elt[0] == '+');
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 if (! skip_p)
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 for (octave_idx_type j = 0; j < skip.numel (); j++)
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 skip_p = (elt == skip[j]);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2149 if (skip_p)
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2150 break;
23445 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
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2153 if (! skip_p)
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 nm = octave::sys::file_ops::concat (dirname, elt);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2156
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2157 octave::sys::file_stat fs (nm);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2158
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2159 if (fs && fs.is_dir ())
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2160 retval += octave::directory_path::path_sep_str () + genpath (nm, skip);
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2161 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2162 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2163 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2164 }
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2165
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2166 return retval;
8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2167 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2168 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2169
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2170 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	2171 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	2172 @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	2173 @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	2174 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	2175
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2176 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	2177 directories with those names.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2178 @end deftypefn */)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2179 {
20816 b16bcd7a2a33 Use int rather than octave_idx_type for nargin data type. Rik <rik@octave.org> parents: 20812 diff changeset	2180 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	2181
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2182 if (nargin == 0)
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2183 print_usage ();
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2184
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2185 octave_value retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2186
10971 386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2187 if (nargin == 1)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2188 {
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20581 diff changeset	2189 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	2190
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2191 retval = octave::genpath (dirname);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2192 }
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2193 else
10971 386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2194 {
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20581 diff changeset	2195 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	2196
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2197 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	2198
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2199 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	2200 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	2201
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	2202 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	2203 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2204
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2205 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2206 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2207
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2208 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	2209 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	2210 @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	2211 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	2212 @end deftypefn */)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2213 {
9105 9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2214 rehash_internal ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2215
21078 49852ff04747 maint: Remove unnecessary declarations of retval. Rik <rik@octave.org> parents: 21021 diff changeset	2216 return ovl ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2217 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2218
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2219 DEFMETHOD (command_line_path, interp, args, ,
4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2220 doc: /* -- texinfo --
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2221 @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	2222 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	2223
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2224 @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	2225 @end deftypefn */)
8586 31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2226 {
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2227 if (! args.empty ())
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2228 print_usage ();
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2229
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2230 octave::load_path& lp = interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2231
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2232 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	2233 }
31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2234
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2235 DEFMETHOD (restoredefaultpath, interp, args, ,
4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2236 doc: /* -- texinfo --
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2237 @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	2238 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	2239
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2240 @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	2241 @end deftypefn */)
7391 f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2242 {
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2243 if (! args.empty ())
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2244 print_usage ();
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2245
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2246 octave::load_path& lp = interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2247
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2248 lp.initialize (true);
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2249
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2250 return ovl (lp.system_path ());
7391 f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2251 }
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2252
8812 7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8746 diff changeset	2253 // 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	2254 // 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	2255 // 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	2256 // ~/.octaverc file
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8746 diff changeset	2257
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2258 DEFMETHOD (__pathorig__, interp, , ,
4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2259 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	2260 @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	2261 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	2262 @end deftypefn */)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2263 {
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2264 octave::load_path& lp = interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2265
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2266 lp.initialize (true);
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2267
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2268 return ovl (lp.system_path ());
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2269 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2270
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2271 DEFMETHOD (path, interp, args, nargout,
4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2272 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	2273 @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	2274 @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	2275 @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	2276 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	2277
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2278 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	2279 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	2280
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2281 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	2282 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	2283
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2284 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	2285 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	2286 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	2287
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2288 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	2289 @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	2290 @end deftypefn */)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2291 {
20817 3d551b2ae928 Use variable name nargin consistently in C++ code. Rik <rik@octave.org> parents: 20816 diff changeset	2292 int nargin = args.length ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2293
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2294 string_vector argv = args.make_argv ("path");
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2295
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2296 octave::load_path& lp = interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2297
20817 3d551b2ae928 Use variable name nargin consistently in C++ code. Rik <rik@octave.org> parents: 20816 diff changeset	2298 if (nargin > 0)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2299 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2300 std::string path = argv[1];
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2301
20817 3d551b2ae928 Use variable name nargin consistently in C++ code. Rik <rik@octave.org> parents: 20816 diff changeset	2302 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	2303 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	2304
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2305 lp.set (path, true);
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2306
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2307 rehash_internal ();
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2308 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2309
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2310 if (nargout > 0)
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2311 return ovl (lp.path ());
20817 3d551b2ae928 Use variable name nargin consistently in C++ code. Rik <rik@octave.org> parents: 20816 diff changeset	2312 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	2313 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2314 octave_stdout <<
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2315 "\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	2316
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2317 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	2318
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2319 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	2320
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2321 octave_stdout << "\n";
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2322 }
20820 eed8ec05f1c8 always return value from DEFUN functions John W. Eaton <jwe@octave.org> parents: 20817 diff changeset	2323
21125 8f76684324b5 maint: change "return octave_value ()" to "return ovl ()". Rik <rik@octave.org> parents: 21078 diff changeset	2324 return ovl ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2325 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2326
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2327 DEFMETHOD (addpath, interp, args, nargout,
4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2328 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	2329 @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	2330 @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	2331 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	2332
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2333 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	2334 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	2335 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	2336 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	2337
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2338 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	2339 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	2340
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2341 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2342 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	2343 @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	2344
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	2345 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	2346 @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	2347 (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	2348
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2349 @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	2350 @end deftypefn */)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2351 {
21953 c46e2532d421 Add directories through addpath in the correct order (bug #48247). Rik <rik@octave.org> parents: 21745 diff changeset	2352 // 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	2353 // Heavily modified and translated to C++ by jwe.
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2354
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2355 int nargin = args.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2356
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2357 if (nargin == 0)
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2358 print_usage ();
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2359
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2360 octave::load_path& lp = interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2361
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2362 octave_value retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2363
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2364 if (nargout > 0)
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2365 retval = lp.path ();
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2366
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2367 bool append = false;
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2368
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2369 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	2370
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2371 if (option_arg.is_string ())
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2372 {
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2373 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	2374
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2375 if (option == "-end")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2376 {
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2377 append = true;
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2378 nargin--;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2379 }
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2380 else if (option == "-begin")
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2381 nargin--;
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2382 }
23586 f6c5db0a02e7 maint: Deprecate is_numeric_type and replace with isnumeric. Rik <rik@octave.org> parents: 23519 diff changeset	2383 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	2384 {
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2385 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	2386
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2387 if (val == 0)
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2388 nargin--;
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2389 else if (val == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2390 {
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2391 append = true;
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2392 nargin--;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2393 }
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2394 else
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20820 diff changeset	2395 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	2396 }
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2397
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2398 bool need_to_update = false;
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2399
21953 c46e2532d421 Add directories through addpath in the correct order (bug #48247). Rik <rik@octave.org> parents: 21745 diff changeset	2400 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	2401 if (! append)
c46e2532d421 Add directories through addpath in the correct order (bug #48247). Rik <rik@octave.org> parents: 21745 diff changeset	2402 arglist.reverse ();
c46e2532d421 Add directories through addpath in the correct order (bug #48247). Rik <rik@octave.org> parents: 21745 diff changeset	2403
c46e2532d421 Add directories through addpath in the correct order (bug #48247). Rik <rik@octave.org> parents: 21745 diff changeset	2404 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	2405 {
21953 c46e2532d421 Add directories through addpath in the correct order (bug #48247). Rik <rik@octave.org> parents: 21745 diff changeset	2406 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	2407
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2408 std::list<std::string> dir_elts = split_path (arg);
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2409
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2410 if (! append)
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2411 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	2412
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	2413 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	2414 {
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	2415 // Remove duplicate directory separators
21956 d5a58720459d addpath: Remove duplicate directory separators before adding path. Rik <rik@octave.org> parents: 21953 diff changeset	2416 dir.erase (std::unique (dir.begin (), dir.end (),
d5a58720459d addpath: Remove duplicate directory separators before adding path. Rik <rik@octave.org> parents: 21953 diff changeset	2417 [](char l, char r)
d5a58720459d addpath: Remove duplicate directory separators before adding path. Rik <rik@octave.org> parents: 21953 diff changeset	2418 {
d5a58720459d addpath: Remove duplicate directory separators before adding path. Rik <rik@octave.org> parents: 21953 diff changeset	2419 return l == r &&
d5a58720459d addpath: Remove duplicate directory separators before adding path. Rik <rik@octave.org> parents: 21953 diff changeset	2420 octave::sys::file_ops::is_dir_sep (l);
d5a58720459d addpath: Remove duplicate directory separators before adding path. Rik <rik@octave.org> parents: 21953 diff changeset	2421 }),
d5a58720459d addpath: Remove duplicate directory separators before adding path. Rik <rik@octave.org> parents: 21953 diff changeset	2422 dir.end ());
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2423
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2424 if (append)
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2425 lp.append (dir, true);
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2426 else
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2427 lp.prepend (dir, true);
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2428
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2429 need_to_update = true;
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 }
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2432
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2433 if (need_to_update)
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2434 rehash_internal ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2435
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2436 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2437 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2438
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2439 DEFMETHOD (rmpath, interp, args, nargout,
4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2440 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	2441 @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	2442 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	2443
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2444 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	2445 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	2446
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2447 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2448 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	2449 @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	2450
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	2451 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	2452 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	2453 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	2454
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21956 diff changeset	2455 @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	2456 @end deftypefn */)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2457 {
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20803 diff changeset	2458 // Originally written by Etienne Grossmann. Heavily modified and translated
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2459 // to C++ by jwe.
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2460
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2461 int nargin = args.length ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2462
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2463 if (nargin == 0)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2464 print_usage ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	2465
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2466 octave_value retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2467
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2468 octave::load_path& lp = interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2469
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2470 if (nargout > 0)
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2471 retval = lp.path ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2472
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2473 bool need_to_update = false;
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2474
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2475 for (int i = 0; i < nargin; i++)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2476 {
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2477 std::string arg = args(i).xstring_value ("rmpath: all arguments must be strings");
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2478 std::list<std::string> dir_elts = split_path (arg);
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2479
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	2480 for (const auto& dir : dir_elts)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2481 {
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2482 //dir = regexprep (dir_elts{j}, '//+', "/");
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2483 //dir = regexprep (dir, '/$', "");
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2484
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2485 if (! lp.remove (dir))
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2486 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	2487 else
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2488 need_to_update = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2489 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2490 }
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2491
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2492 if (need_to_update)
c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20770 diff changeset	2493 rehash_internal ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2494
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2495 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2496 }
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16567 diff changeset	2497
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2498 DEFMETHOD (__dump_load_path__, interp, , ,
4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2499 doc: /* -- texinfo --
22299 9fc91bb2aec3 doc: grammarcheck documentation for 4.2 release. Rik <rik@octave.org> parents: 22094 diff changeset	2500 @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	2501 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	2502 @end deftypefn */)
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16567 diff changeset	2503 {
23519 4fe410bd918d use DEFMETHOD for some built-in functions John W. Eaton <jwe@octave.org> parents: 23445 diff changeset	2504 octave::load_path& lp = interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2505
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23418 diff changeset	2506 lp.display (octave_stdout);
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16567 diff changeset	2507
20941 a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()". Rik <rik@octave.org> parents: 20939 diff changeset	2508 return ovl ();
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16567 diff changeset	2509 }

Mercurial > octave

annotate libinterp/corefcn/load-path.cc @ 23586:f6c5db0a02e7