octave-nkf: libinterp/interpfcn/load-path.cc annotate

annotate libinterp/interpfcn/load-path.cc @ 16567:68176102fe07

* load-path.cc (Faddpath): Doc fix.

author	John W. Eaton <jwe@octave.org>
date	Thu, 25 Apr 2013 02:45:08 -0400
parents	3cd80afc3509
children	7368654f302f

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
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 13983 diff changeset	3 Copyright (C) 2006-2012 John W. Eaton
10521 4d1fc073fbb7 add some missing copyright stmts Jaroslav Hajek <highegg@gmail.com> parents: 10446 diff changeset	4 Copyright (C) 2010 VZLU Prague
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	5
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	7
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	9 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6850 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6850 diff changeset	11 option) any later version.
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	12
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	16 for more details.
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	17
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	18 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6850 diff changeset	19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6850 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
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	24 #ifdef HAVE_CONFIG_H
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	25 #include <config.h>
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"
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 12642 diff changeset	35 #include "singleton-cleanup.h"
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	36
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	37 #include "defaults.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	38 #include "defun.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	39 #include "input.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	40 #include "load-path.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	41 #include "pager.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	42 #include "parse.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	43 #include "toplev.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	44 #include "unwind-prot.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	45 #include "utils.h"
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	46
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	47 load_path *load_path::instance = 0;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	48 load_path::hook_fcn_ptr load_path::add_hook = execute_pkg_add;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	49 load_path::hook_fcn_ptr load_path::remove_hook = execute_pkg_del;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	50 std::string load_path::command_line_path;
6630 0fcc8d65b571 [project @ 2007-05-16 15:32:09 by jwe] jwe parents: 6626 diff changeset	51 std::string load_path::sys_path;
8329 c91b59532f32 load-path.cc (load_path::dir_info::update): smarter handling of relative names John W. Eaton <jwe@octave.org> parents: 8325 diff changeset	52 load_path::abs_dir_cache_type load_path::abs_dir_cache;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	53
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	54 void
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	55 load_path::dir_info::update (void)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	56 {
8330 8303f0e912bc load-path.cc (load_path::dir_info::update): simplify previous change John W. Eaton <jwe@octave.org> parents: 8329 diff changeset	57 file_stat fs (dir_name);
8303f0e912bc load-path.cc (load_path::dir_info::update): simplify previous change John W. Eaton <jwe@octave.org> parents: 8329 diff changeset	58
8303f0e912bc load-path.cc (load_path::dir_info::update): simplify previous change John W. Eaton <jwe@octave.org> parents: 8329 diff changeset	59 if (fs)
8329 c91b59532f32 load-path.cc (load_path::dir_info::update): smarter handling of relative names John W. Eaton <jwe@octave.org> parents: 8325 diff changeset	60 {
8330 8303f0e912bc load-path.cc (load_path::dir_info::update): simplify previous change John W. Eaton <jwe@octave.org> parents: 8329 diff changeset	61 if (is_relative)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	62 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	63 try
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	64 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	65 std::string abs_name = octave_env::make_absolute (dir_name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	66
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	67 abs_dir_cache_iterator p = abs_dir_cache.find (abs_name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	68
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	69 if (p != abs_dir_cache.end ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	70 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	71 // The directory is in the cache of all directories
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	72 // we have visited (indexed by its absolute name).
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	73 // If it is out of date, initialize it. Otherwise,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	74 // copy the info from the cache. By doing that, we
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	75 // avoid unnecessary calls to stat that can slow
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	76 // things down tremendously for large directories.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	77
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	78 const dir_info& di = p->second;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	79
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	80 if (fs.mtime () + fs.time_resolution () > di.dir_time_last_checked)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	81 initialize ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	82 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	83 *this = di;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	84 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	85 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	86 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	87 // We haven't seen this directory before.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	88
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	89 initialize ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	90 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	91 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	92 catch (octave_execution_exception)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	93 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	94 // Skip updating if we don't know where we are, but
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	95 // don't treat it as an error.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	96
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	97 error_state = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	98 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	99 }
9764 7922a24f78c0 fix relative directory caching John W. Eaton <jwe@octave.org> parents: 9748 diff changeset	100 else if (fs.mtime () + fs.time_resolution () > dir_time_last_checked)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	101 initialize ();
8329 c91b59532f32 load-path.cc (load_path::dir_info::update): smarter handling of relative names John W. Eaton <jwe@octave.org> parents: 8325 diff changeset	102 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	103 else
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	104 {
8329 c91b59532f32 load-path.cc (load_path::dir_info::update): smarter handling of relative names John W. Eaton <jwe@octave.org> parents: 8325 diff changeset	105 std::string msg = fs.error ();
c91b59532f32 load-path.cc (load_path::dir_info::update): smarter handling of relative names John W. Eaton <jwe@octave.org> parents: 8325 diff changeset	106 warning ("load_path: %s: %s", dir_name.c_str (), msg.c_str ());
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	107 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	108 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	109
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	110 void
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	111 load_path::dir_info::initialize (void)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	112 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	113 is_relative = ! octave_env::absolute_pathname (dir_name);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	114
9748 d6b2b708b6b0 load-path: compare directory timestamps with tolerance John W. Eaton <jwe@octave.org> parents: 9581 diff changeset	115 dir_time_last_checked = octave_time (static_cast<time_t> (0));
d6b2b708b6b0 load-path: compare directory timestamps with tolerance John W. Eaton <jwe@octave.org> parents: 9581 diff changeset	116
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	117 file_stat fs (dir_name);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	118
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	119 if (fs)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	120 {
10907 6105ed2db9d7 load_path::dir_info::initialize: clear method_file_map before updating file list John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	121 method_file_map.clear ();
6105ed2db9d7 load_path::dir_info::initialize: clear method_file_map before updating file list John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	122
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	123 dir_mtime = fs.mtime ();
9748 d6b2b708b6b0 load-path: compare directory timestamps with tolerance John W. Eaton <jwe@octave.org> parents: 9581 diff changeset	124 dir_time_last_checked = octave_time ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	125
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	126 get_file_list (dir_name);
8329 c91b59532f32 load-path.cc (load_path::dir_info::update): smarter handling of relative names John W. Eaton <jwe@octave.org> parents: 8325 diff changeset	127
8704 236ff50db90f load-path.cc: catch execution exception in getcwd John W. Eaton <jwe@octave.org> parents: 8609 diff changeset	128 try
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	129 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	130 std::string abs_name = octave_env::make_absolute (dir_name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	131
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	132 // FIXME -- nothing is ever removed from this cache of
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	133 // directory information, so there could be some resource
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	134 // problems. Perhaps it should be pruned from time to time.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	135
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	136 abs_dir_cache[abs_name] = *this;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	137 }
8704 236ff50db90f load-path.cc: catch execution exception in getcwd John W. Eaton <jwe@octave.org> parents: 8609 diff changeset	138 catch (octave_execution_exception)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	139 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	140 // Skip updating if we don't know where we are.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	141 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	142 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	143 else
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	144 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	145 std::string msg = fs.error ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	146 warning ("load_path: %s: %s", dir_name.c_str (), msg.c_str ());
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	147 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	148 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	149
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	150 void
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	151 load_path::dir_info::get_file_list (const std::string& d)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	152 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	153 dir_entry dir (d);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	154
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	155 if (dir)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	156 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	157 string_vector flist = dir.read ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	158
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	159 octave_idx_type len = flist.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	160
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	161 all_files.resize (len);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	162 fcn_files.resize (len);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	163
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	164 octave_idx_type all_files_count = 0;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	165 octave_idx_type fcn_files_count = 0;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	166
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	167 for (octave_idx_type i = 0; i < len; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	168 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	169 std::string fname = flist[i];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	170
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	171 std::string full_name = file_ops::concat (d, fname);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	172
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	173 file_stat fs (full_name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	174
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	175 if (fs)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	176 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	177 if (fs.is_dir ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	178 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	179 if (fname == "private")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	180 get_private_file_map (full_name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	181 else if (fname[0] == '@')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	182 get_method_file_map (full_name, fname.substr (1));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	183 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	184 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	185 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	186 all_files[all_files_count++] = fname;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	187
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	188 size_t pos = fname.rfind ('.');
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	189
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	190 if (pos != std::string::npos)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	191 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	192 std::string ext = fname.substr (pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	193
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	194 if (ext == ".m" \|\| ext == ".oct" \|\| ext == ".mex")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	195 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	196 std::string base = fname.substr (0, pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	197
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	198 if (valid_identifier (base))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	199 fcn_files[fcn_files_count++] = fname;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	200 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	201 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	202 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	203 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	204 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	205
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	206 all_files.resize (all_files_count);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	207 fcn_files.resize (fcn_files_count);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	208 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	209 else
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	210 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	211 std::string msg = dir.error ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	212 warning ("load_path: %s: %s", d.c_str (), msg.c_str ());
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	213 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	214 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	215
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	216 load_path::dir_info::fcn_file_map_type
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	217 get_fcn_files (const std::string& d)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	218 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	219 load_path::dir_info::fcn_file_map_type retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	220
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	221 dir_entry dir (d);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	222
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	223 if (dir)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	224 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	225 string_vector flist = dir.read ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	226
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	227 octave_idx_type len = flist.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	228
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	229 for (octave_idx_type i = 0; i < len; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	230 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	231 std::string fname = flist[i];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	232
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	233 std::string ext;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	234 std::string base = fname;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	235
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	236 size_t pos = fname.rfind ('.');
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	237
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	238 if (pos != std::string::npos)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	239 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	240 base = fname.substr (0, pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	241 ext = fname.substr (pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	242
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	243 if (valid_identifier (base))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	244 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	245 int t = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	246
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	247 if (ext == ".m")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	248 t = load_path::M_FILE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	249 else if (ext == ".oct")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	250 t = load_path::OCT_FILE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	251 else if (ext == ".mex")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	252 t = load_path::MEX_FILE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	253
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	254 retval[base] \|= t;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	255 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	256 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	257 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	258 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	259 else
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	260 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	261 std::string msg = dir.error ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	262 warning ("load_path: %s: %s", d.c_str (), msg.c_str ());
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	263 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	264
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	265 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	266 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	267
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	268 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	269 load_path::dir_info::get_private_file_map (const std::string& d)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	270 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	271 private_file_map = get_fcn_files (d);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	272 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	273
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	274 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	275 load_path::dir_info::get_method_file_map (const std::string& d,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	276 const std::string& class_name)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	277 {
7971 dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	278 method_file_map[class_name].method_file_map = get_fcn_files (d);
dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	279
dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	280 std::string pd = file_ops::concat (d, "private");
dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	281
dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	282 file_stat fs (pd);
dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	283
dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	284 if (fs && fs.is_dir ())
dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	285 method_file_map[class_name].private_file_map = get_fcn_files (pd);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	286 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	287
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	288 bool
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	289 load_path::instance_ok (void)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	290 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	291 bool retval = true;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	292
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	293 if (! instance)
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 12642 diff changeset	294 {
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 12642 diff changeset	295 instance = new load_path ();
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 12642 diff changeset	296
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 12642 diff changeset	297 if (instance)
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 12642 diff changeset	298 singleton_cleanup_list::add (cleanup_instance);
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 12642 diff changeset	299 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	300
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	301 if (! instance)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	302 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	303 ::error ("unable to create load path object!");
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	304
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	305 retval = false;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	306 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	307
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	308 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	309 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	310
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	311 // FIXME -- maybe we should also maintain a map to speed up this
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	312 // method of access.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	313
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	314 load_path::const_dir_info_list_iterator
5919 ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	315 load_path::find_dir_info (const std::string& dir_arg) const
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	316 {
5919 ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	317 std::string dir = file_ops::tilde_expand (dir_arg);
ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	318
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	319 const_dir_info_list_iterator retval = dir_info_list.begin ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	320
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	321 while (retval != dir_info_list.end ())
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	322 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	323 if (retval->dir_name == dir)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	324 break;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	325
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	326 retval++;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	327 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	328
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	329 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	330 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	331
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	332 load_path::dir_info_list_iterator
5919 ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	333 load_path::find_dir_info (const std::string& dir_arg)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	334 {
5919 ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	335 std::string dir = file_ops::tilde_expand (dir_arg);
ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	336
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	337 dir_info_list_iterator retval = dir_info_list.begin ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	338
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	339 while (retval != dir_info_list.end ())
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	340 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	341 if (retval->dir_name == dir)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	342 break;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	343
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	344 retval++;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	345 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	346
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	347 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	348 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	349
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	350 bool
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	351 load_path::contains (const std::string& dir) const
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	352 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	353 return find_dir_info (dir) != dir_info_list.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	354 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	355
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	356 bool
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	357 load_path::do_contains_canonical (const std::string& dir) const
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	358 {
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	359 bool retval = false;
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	360
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	361 for (const_dir_info_list_iterator i = dir_info_list.begin ();
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	362 i != dir_info_list.end ();
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	363 i++)
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	364 {
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	365 if (same_file (dir, i->dir_name))
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	366 {
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	367 retval = true;
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	368 break;
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	369 }
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	370 }
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	371
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	372 return retval;
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	373 }
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16203 diff changeset	374
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	375 void
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	376 load_path::move_fcn_map (const std::string& dir_name,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	377 const string_vector& fcn_files, bool at_end)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	378 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	379 octave_idx_type len = fcn_files.length ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	380
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	381 for (octave_idx_type k = 0; k < len; k++)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	382 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	383 std::string fname = fcn_files[k];
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	384
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	385 std::string ext;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	386 std::string base = fname;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	387
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	388 size_t pos = fname.rfind ('.');
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	389
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	390 if (pos != std::string::npos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	391 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	392 base = fname.substr (0, pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	393 ext = fname.substr (pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	394 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	395
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	396 file_info_list_type& file_info_list = fcn_map[base];
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	397
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	398 if (file_info_list.size () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	399 continue;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	400 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	401 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	402 for (file_info_list_iterator p = file_info_list.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	403 p != file_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	404 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	405 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	406 if (p->dir_name == dir_name)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	407 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	408 file_info fi = *p;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	409
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	410 file_info_list.erase (p);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	411
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	412 if (at_end)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	413 file_info_list.push_back (fi);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	414 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	415 file_info_list.push_front (fi);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	416
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	417 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	418 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	419 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	420 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	421 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	422 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	423
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	424 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	425 load_path::move_method_map (const std::string& dir_name, bool at_end)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	426 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	427 for (method_map_iterator i = method_map.begin ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	428 i != method_map.end ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	429 i++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	430 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	431 std::string class_name = i->first;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	432
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	433 fcn_map_type& fm = i->second;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	434
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	435 std::string full_dir_name
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	436 = file_ops::concat (dir_name, "@" + class_name);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	437
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	438 for (fcn_map_iterator q = fm.begin (); q != fm.end (); q++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	439 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	440 file_info_list_type& file_info_list = q->second;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	441
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	442 if (file_info_list.size () == 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	443 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	444 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	445 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	446 for (file_info_list_iterator p = file_info_list.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	447 p != file_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	448 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	449 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	450 if (p->dir_name == full_dir_name)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	451 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	452 file_info fi = *p;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	453
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	454 file_info_list.erase (p);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	455
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	456 if (at_end)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	457 file_info_list.push_back (fi);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	458 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	459 file_info_list.push_front (fi);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	460
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	461 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	462 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	463 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	464 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	465 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	466 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	467 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	468
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	469 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	470 load_path::move (dir_info_list_iterator i, bool at_end)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	471 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	472 if (dir_info_list.size () > 1)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	473 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	474 dir_info di = *i;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	475
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	476 dir_info_list.erase (i);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	477
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	478 if (at_end)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	479 dir_info_list.push_back (di);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	480 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	481 dir_info_list.push_front (di);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	482
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	483 std::string dir_name = di.dir_name;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	484
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	485 move_fcn_map (dir_name, di.fcn_files, at_end);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	486
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	487 // No need to move elements of private function map.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	488
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	489 move_method_map (dir_name, at_end);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	490 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	491 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	492
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	493 static void
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	494 maybe_add_path_elts (std::string& path, const std::string& dir)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	495 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	496 std::string tpath = genpath (dir);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	497
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	498 if (! tpath.empty ())
7374 4ff9611147ba [project @ 2008-01-15 00:50:50 by jwe] jwe parents: 7336 diff changeset	499 {
4ff9611147ba [project @ 2008-01-15 00:50:50 by jwe] jwe parents: 7336 diff changeset	500 if (path.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	501 path = tpath;
7374 4ff9611147ba [project @ 2008-01-15 00:50:50 by jwe] jwe parents: 7336 diff changeset	502 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	503 path += dir_path::path_sep_str () + tpath;
7374 4ff9611147ba [project @ 2008-01-15 00:50:50 by jwe] jwe parents: 7336 diff changeset	504 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	505 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	506
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	507 void
6365 ccdb8ffbb994 [project @ 2007-02-27 19:43:35 by jwe] jwe parents: 6196 diff changeset	508 load_path::do_initialize (bool set_initial_path)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	509 {
7374 4ff9611147ba [project @ 2008-01-15 00:50:50 by jwe] jwe parents: 7336 diff changeset	510 sys_path = "";
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	511
6365 ccdb8ffbb994 [project @ 2007-02-27 19:43:35 by jwe] jwe parents: 6196 diff changeset	512 if (set_initial_path)
ccdb8ffbb994 [project @ 2007-02-27 19:43:35 by jwe] jwe parents: 6196 diff changeset	513 {
6626 af16354ea09c [project @ 2007-05-16 14:58:26 by jwe] jwe parents: 6625 diff changeset	514 maybe_add_path_elts (sys_path, Vlocal_ver_oct_file_dir);
af16354ea09c [project @ 2007-05-16 14:58:26 by jwe] jwe parents: 6625 diff changeset	515 maybe_add_path_elts (sys_path, Vlocal_api_oct_file_dir);
af16354ea09c [project @ 2007-05-16 14:58:26 by jwe] jwe parents: 6625 diff changeset	516 maybe_add_path_elts (sys_path, Vlocal_oct_file_dir);
af16354ea09c [project @ 2007-05-16 14:58:26 by jwe] jwe parents: 6625 diff changeset	517 maybe_add_path_elts (sys_path, Vlocal_ver_fcn_file_dir);
af16354ea09c [project @ 2007-05-16 14:58:26 by jwe] jwe parents: 6625 diff changeset	518 maybe_add_path_elts (sys_path, Vlocal_api_fcn_file_dir);
af16354ea09c [project @ 2007-05-16 14:58:26 by jwe] jwe parents: 6625 diff changeset	519 maybe_add_path_elts (sys_path, Vlocal_fcn_file_dir);
af16354ea09c [project @ 2007-05-16 14:58:26 by jwe] jwe parents: 6625 diff changeset	520 maybe_add_path_elts (sys_path, Voct_file_dir);
af16354ea09c [project @ 2007-05-16 14:58:26 by jwe] jwe parents: 6625 diff changeset	521 maybe_add_path_elts (sys_path, Vfcn_file_dir);
6365 ccdb8ffbb994 [project @ 2007-02-27 19:43:35 by jwe] jwe parents: 6196 diff changeset	522 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	523
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	524 std::string tpath = load_path::command_line_path;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	525
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	526 if (tpath.empty ())
8141 31d7885d9869 load-path.cc (load_path::do_initialize): look for OCTAVE_PATH in the environment, not OCTAVE_LOADPATH John W. Eaton <jwe@octave.org> parents: 8041 diff changeset	527 tpath = octave_env::getenv ("OCTAVE_PATH");
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	528
10242 4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	529 std::string xpath;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	530
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	531 if (! tpath.empty ())
10242 4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	532 {
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	533 xpath = tpath;
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	534
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	535 if (! sys_path.empty ())
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	536 xpath += dir_path::path_sep_str () + sys_path;
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	537 }
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	538 else
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	539 xpath = sys_path;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	540
14376 7dd6ac033e69 Warn when the default path is overwritten Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14360 diff changeset	541 do_set (xpath, false, true);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	542 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	543
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	544 void
15008 ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	545 load_path::do_clear (void)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	546 {
15008 ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	547 dir_info_list.clear ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	548 fcn_map.clear ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	549 private_fcn_map.clear ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	550 method_map.clear ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	551 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	552
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	553 static std::list<std::string>
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	554 split_path (const std::string& p)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	555 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	556 std::list<std::string> retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	557
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	558 size_t beg = 0;
8008 4d13a7a2f6ab dir_path: use singleton class for static data members John W. Eaton <jwe@octave.org> parents: 8007 diff changeset	559 size_t end = p.find (dir_path::path_sep_char ());
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	560
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	561 size_t len = p.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	562
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	563 while (end != std::string::npos)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	564 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	565 std::string elt = p.substr (beg, end-beg);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	566
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	567 if (! elt.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	568 retval.push_back (elt);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	569
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	570 beg = end + 1;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	571
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	572 if (beg == len)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	573 break;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	574
8008 4d13a7a2f6ab dir_path: use singleton class for static data members John W. Eaton <jwe@octave.org> parents: 8007 diff changeset	575 end = p.find (dir_path::path_sep_char (), beg);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	576 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	577
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	578 std::string elt = p.substr (beg);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	579
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	580 if (! elt.empty ())
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	581 retval.push_back (elt);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	582
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	583 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	584 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	585
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	586 void
14376 7dd6ac033e69 Warn when the default path is overwritten Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14360 diff changeset	587 load_path::do_set (const std::string& p, bool warn, bool is_init)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	588 {
15008 ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	589 // Use a list when we need to preserve order.
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	590 std::list<std::string> elts = split_path (p);
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	591
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	592 // Use a set when we need to search and order is not important.
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	593 std::set<std::string> elts_set (elts.begin (), elts.end ());
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	594
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	595 if (is_init)
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	596 init_dirs = elts_set;
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	597 else
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	598 {
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	599 for (std::set<std::string>::const_iterator it = init_dirs.begin ();
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	600 it != init_dirs.end (); it++)
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	601 {
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	602 if (elts_set.find (*it) == elts_set.end ())
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	603 {
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	604 warning_with_id ("Octave:remove-init-dir",
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	605 "default load path altered. Some built-in functions may not be found. Try restoredefaultpath() to recover it.");
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	606 break;
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	607 }
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	608 }
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	609 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	610
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	611 // Temporarily disable add hook.
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	612
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9807 diff changeset	613 unwind_protect frame;
2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9807 diff changeset	614 frame.protect_var (add_hook);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	615
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	616 add_hook = 0;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	617
15008 ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	618 do_clear ();
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	619
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	620 for (std::list<std::string>::const_iterator i = elts.begin ();
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	621 i != elts.end (); i++)
ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	622 do_append (*i, warn);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	623
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	624 // Restore add hook and execute for all newly added directories.
15469 72868cae7624 eliminate some deprecated function warnings John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	625 frame.run_first ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	626
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	627 for (dir_info_list_iterator i = dir_info_list.begin ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	628 i != dir_info_list.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	629 i++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	630 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	631 if (add_hook)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	632 add_hook (i->dir_name);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	633 }
10242 4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	634
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	635 // Always prepend current directory.
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	636 do_prepend (".", warn);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	637 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	638
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	639 void
15008 ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	640 load_path::do_append (const std::string& dir, bool warn)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	641 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	642 if (! dir.empty ())
15008 ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	643 do_add (dir, true, warn);
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	644 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	645
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	646 void
b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	647 load_path::do_prepend (const std::string& dir, bool warn)
b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	648 {
b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	649 if (! dir.empty ())
b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	650 do_add (dir, false, warn);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	651 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	652
11578 06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	653 // Strip trailing directory separators.
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	654
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	655 static std::string
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	656 strip_trailing_separators (const std::string& dir_arg)
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	657 {
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	658 std::string dir = dir_arg;
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	659
12438 ab4c6bbff14a use correct type for std::string length John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	660 size_t k = dir.length ();
ab4c6bbff14a use correct type for std::string length John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	661
11578 06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	662 while (k > 1 && file_ops::is_dir_sep (dir[k-1]))
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	663 k--;
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	664
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	665 if (k < dir.length ())
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	666 dir.resize (k);
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	667
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	668 return dir;
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	669 }
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	670
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	671 void
15008 ff9a638a5555 preserve order of path elements when doing "path (new_path)" John W. Eaton <jwe@octave.org> parents: 14884 diff changeset	672 load_path::do_add (const std::string& dir_arg, bool at_end, bool warn)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	673 {
5919 ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	674 size_t len = dir_arg.length ();
5911 a65b51ed388c [project @ 2006-07-28 16:31:00 by jwe] jwe parents: 5871 diff changeset	675
5919 ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	676 if (len > 1 && dir_arg.substr (len-2) == "//")
5911 a65b51ed388c [project @ 2006-07-28 16:31:00 by jwe] jwe parents: 5871 diff changeset	677 warning_with_id ("Octave:recursive-path-search",
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	678 "trailing '//' is no longer special in search path elements");
5911 a65b51ed388c [project @ 2006-07-28 16:31:00 by jwe] jwe parents: 5871 diff changeset	679
5919 ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	680 std::string dir = file_ops::tilde_expand (dir_arg);
ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	681
11578 06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	682 dir = strip_trailing_separators (dir);
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	683
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	684 dir_info_list_iterator i = find_dir_info (dir);
b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	685
b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	686 if (i != dir_info_list.end ())
b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	687 move (i, at_end);
b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	688 else
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	689 {
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	690 file_stat fs (dir);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	691
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	692 if (fs)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	693 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	694 if (fs.is_dir ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	695 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	696 dir_info di (dir);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	697
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	698 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	699 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	700 if (at_end)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	701 dir_info_list.push_back (di);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	702 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	703 dir_info_list.push_front (di);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	704
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	705 add_to_fcn_map (di, at_end);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	706
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	707 add_to_private_fcn_map (di);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	708
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	709 add_to_method_map (di, at_end);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	710
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	711 if (add_hook)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	712 add_hook (dir);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	713 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	714 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	715 else if (warn)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	716 warning ("addpath: %s: not a directory", dir_arg.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	717 }
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	718 else if (warn)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	719 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	720 std::string msg = fs.error ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	721 warning ("addpath: %s: %s", dir_arg.c_str (), msg.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	722 }
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	723 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	724
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	725 // FIXME -- is there a better way to do this?
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	726
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	727 i = find_dir_info (".");
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	728
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	729 if (i != dir_info_list.end ())
5871 b9fd54407c8d [project @ 2006-06-30 16:48:39 by jwe] jwe parents: 5867 diff changeset	730 move (i, false);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	731 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	732
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	733 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	734 load_path::remove_fcn_map (const std::string& dir,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	735 const string_vector& fcn_files)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	736 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	737 octave_idx_type len = fcn_files.length ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	738
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	739 for (octave_idx_type k = 0; k < len; k++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	740 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	741 std::string fname = fcn_files[k];
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	742
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	743 std::string ext;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	744 std::string base = fname;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	745
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	746 size_t pos = fname.rfind ('.');
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	747
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	748 if (pos != std::string::npos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	749 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	750 base = fname.substr (0, pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	751 ext = fname.substr (pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	752 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	753
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	754 file_info_list_type& file_info_list = fcn_map[base];
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	755
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	756 for (file_info_list_iterator p = file_info_list.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	757 p != file_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	758 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	759 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	760 if (p->dir_name == dir)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	761 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	762 file_info_list.erase (p);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	763
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	764 if (file_info_list.empty ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	765 fcn_map.erase (fname);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	766
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	767 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	768 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	769 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	770 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	771 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	772
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	773 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	774 load_path::remove_private_fcn_map (const std::string& dir)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	775 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	776 private_fcn_map_iterator p = private_fcn_map.find (dir);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	777
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	778 if (p != private_fcn_map.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	779 private_fcn_map.erase (p);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	780 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	781
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	782 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	783 load_path::remove_method_map (const std::string& dir)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	784 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	785 for (method_map_iterator i = method_map.begin ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	786 i != method_map.end ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	787 i++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	788 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	789 std::string class_name = i->first;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	790
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	791 fcn_map_type& fm = i->second;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	792
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	793 std::string full_dir_name = file_ops::concat (dir, "@" + class_name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	794
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	795 for (fcn_map_iterator q = fm.begin (); q != fm.end (); q++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	796 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	797 file_info_list_type& file_info_list = q->second;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	798
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	799 if (file_info_list.size () == 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	800 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	801 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	802 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	803 for (file_info_list_iterator p = file_info_list.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	804 p != file_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	805 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	806 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	807 if (p->dir_name == full_dir_name)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	808 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	809 file_info_list.erase (p);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	810
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	811 // FIXME -- if there are no other elements, we
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	812 // should remove this element of fm but calling
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	813 // erase here would invalidate the iterator q.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	814
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	815 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	816 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	817 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	818 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	819 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	820 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	821 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	822
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	823 bool
5919 ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	824 load_path::do_remove (const std::string& dir_arg)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	825 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	826 bool retval = false;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	827
5919 ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	828 if (! dir_arg.empty ())
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	829 {
5919 ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	830 if (dir_arg == ".")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	831 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	832 warning ("rmpath: can't remove \".\" from path");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	833
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	834 // Avoid additional warnings.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	835 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	836 }
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	837 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	838 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	839 std::string dir = file_ops::tilde_expand (dir_arg);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	840
11578 06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	841 dir = strip_trailing_separators (dir);
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	842
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	843 dir_info_list_iterator i = find_dir_info (dir);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	844
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	845 if (i != dir_info_list.end ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	846 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	847 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	848
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	849 if (remove_hook)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	850 remove_hook (dir);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	851
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	852 string_vector fcn_files = i->fcn_files;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	853
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	854 dir_info_list.erase (i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	855
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	856 remove_fcn_map (dir, fcn_files);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	857
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	858 remove_private_fcn_map (dir);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	859
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	860 remove_method_map (dir);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	861 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	862 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	863 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	864
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	865 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	866 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	867
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	868 void
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	869 load_path::do_update (void) const
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	870 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	871 // I don't see a better way to do this because we need to
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	872 // preserve the correct directory ordering for new files that
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	873 // have appeared.
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	874
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	875 fcn_map.clear ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	876
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	877 private_fcn_map.clear ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	878
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	879 method_map.clear ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	880
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	881 for (dir_info_list_iterator p = dir_info_list.begin ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	882 p != dir_info_list.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	883 p++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	884 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	885 dir_info& di = *p;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	886
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	887 di.update ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	888
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	889 add_to_fcn_map (di, true);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	890
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	891 add_to_private_fcn_map (di);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	892
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	893 add_to_method_map (di, true);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	894 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	895 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	896
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	897 bool
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	898 load_path::check_file_type (std::string& fname, int type, int possible_types,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	899 const std::string& fcn, const char *who)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	900 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	901 bool retval = false;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	902
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	903 if (type == load_path::OCT_FILE)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	904 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	905 if ((type & possible_types) == load_path::OCT_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	906 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	907 fname += ".oct";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	908 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	909 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	910 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	911 else if (type == load_path::M_FILE)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	912 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	913 if ((type & possible_types) == load_path::M_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	914 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	915 fname += ".m";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	916 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	917 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	918 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	919 else if (type == load_path::MEX_FILE)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	920 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	921 if ((type & possible_types) == load_path::MEX_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	922 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	923 fname += ".mex";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	924 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	925 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	926 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	927 else if (type == (load_path::M_FILE \| load_path::OCT_FILE))
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	928 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	929 if (possible_types & load_path::OCT_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	930 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	931 fname += ".oct";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	932 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	933 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	934 else if (possible_types & load_path::M_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	935 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	936 fname += ".m";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	937 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	938 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	939 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	940 else if (type == (load_path::M_FILE \| load_path::MEX_FILE))
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	941 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	942 if (possible_types & load_path::MEX_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	943 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	944 fname += ".mex";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	945 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	946 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	947 else if (possible_types & load_path::M_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	948 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	949 fname += ".m";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	950 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	951 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	952 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	953 else if (type == (load_path::OCT_FILE \| load_path::MEX_FILE))
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	954 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	955 if (possible_types & load_path::OCT_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	956 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	957 fname += ".oct";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	958 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	959 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	960 else if (possible_types & load_path::MEX_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	961 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	962 fname += ".mex";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	963 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	964 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	965 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	966 else if (type == (load_path::M_FILE \| load_path::OCT_FILE
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	967 \| load_path::MEX_FILE))
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	968 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	969 if (possible_types & load_path::OCT_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	970 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	971 fname += ".oct";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	972 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	973 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	974 else if (possible_types & load_path::MEX_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	975 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	976 fname += ".mex";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	977 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	978 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	979 else if (possible_types & load_path::M_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	980 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	981 fname += ".m";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	982 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	983 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	984 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	985 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	986 error ("%s: %s: invalid type code = %d", who, fcn.c_str (), type);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	987
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	988 return retval;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11578 diff changeset	989 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	990
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	991 std::string
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	992 load_path::do_find_fcn (const std::string& fcn, std::string& dir_name,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	993 int type) const
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	994 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	995 std::string retval;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11578 diff changeset	996
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	997 // update ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	998
8593 4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	999 if (fcn.length () > 0 && fcn[0] == '@')
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1000 {
8593 4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	1001 size_t pos = fcn.find ('/');
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1002
8593 4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	1003 if (pos != std::string::npos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1004 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1005 std::string class_name = fcn.substr (1, pos-1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1006 std::string meth = fcn.substr (pos+1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1007
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1008 retval = do_find_method (class_name, meth, dir_name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1009 }
8593 4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	1010 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1011 retval = std::string ();
8593 4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	1012 }
4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	1013 else
4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	1014 {
4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	1015 dir_name = std::string ();
4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	1016
4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	1017 const_fcn_map_iterator p = fcn_map.find (fcn);
4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	1018
4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	1019 if (p != fcn_map.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1020 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1021 const file_info_list_type& file_info_list = p->second;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1022
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1023 for (const_file_info_list_iterator i = file_info_list.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1024 i != file_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1025 i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1026 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1027 const file_info& fi = *i;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1028
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1029 retval = file_ops::concat (fi.dir_name, fcn);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1030
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1031 if (check_file_type (retval, type, fi.types,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1032 fcn, "load_path::do_find_fcn"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1033 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1034 dir_name = fi.dir_name;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1035 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1036 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1037 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1038 retval = std::string ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1039 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1040 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1041 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1042
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1043 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1044 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1045
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1046 std::string
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1047 load_path::do_find_private_fcn (const std::string& dir,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1048 const std::string& fcn, int type) const
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1049 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1050 std::string retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1051
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1052 // update ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1053
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1054 const_private_fcn_map_iterator q = private_fcn_map.find (dir);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1055
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1056 if (q != private_fcn_map.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1057 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1058 const dir_info::fcn_file_map_type& m = q->second;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1059
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1060 dir_info::const_fcn_file_map_iterator p = m.find (fcn);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1061
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1062 if (p != m.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1063 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1064 std::string fname
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1065 = file_ops::concat (file_ops::concat (dir, "private"), fcn);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1066
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1067 if (check_file_type (fname, type, p->second, fcn,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1068 "load_path::find_private_fcn"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1069 retval = fname;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1070 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1071 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1072
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1073 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1074 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1075
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1076 std::string
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1077 load_path::do_find_method (const std::string& class_name,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1078 const std::string& meth,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1079 std::string& dir_name, int type) const
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1080 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1081 std::string retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1082
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1083 // update ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1084
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1085 dir_name = std::string ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1086
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1087 const_method_map_iterator q = method_map.find (class_name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1088
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1089 if (q != method_map.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1090 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1091 const fcn_map_type& m = q->second;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1092
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1093 const_fcn_map_iterator p = m.find (meth);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1094
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9458 diff changeset	1095 if (p != m.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1096 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1097 const file_info_list_type& file_info_list = p->second;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1098
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1099 for (const_file_info_list_iterator i = file_info_list.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1100 i != file_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1101 i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1102 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1103 const file_info& fi = *i;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1104
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1105 retval = file_ops::concat (fi.dir_name, meth);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1106
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1107 bool found = check_file_type (retval, type, fi.types,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1108 meth, "load_path::do_find_method");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1109
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1110 if (found)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1111 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1112 dir_name = fi.dir_name;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1113 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1114 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1115 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1116 retval = std::string ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1117 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1118 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1119 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1120
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1121 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1122 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1123
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1124 std::list<std::string>
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1125 load_path::do_methods (const std::string& class_name) const
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1126 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1127 std::list<std::string> retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1128
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1129 // update ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1130
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1131 const_method_map_iterator q = method_map.find (class_name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1132
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1133 if (q != method_map.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1134 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1135 const fcn_map_type& m = q->second;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1136
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1137 for (const_fcn_map_iterator p = m.begin (); p != m.end (); p++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1138 retval.push_back (p->first);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1139 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1140
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1141 if (! retval.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1142 retval.sort ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1143
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1144 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1145 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1146
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1147 std::list<std::string>
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1148 load_path::do_overloads (const std::string& meth) const
9458 0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1149 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1150 std::list<std::string> retval;
9458 0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1151
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1152 // update ();
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1153
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1154 for (const_method_map_iterator q = method_map.begin ();
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1155 q != method_map.end (); q++)
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1156 {
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1157 const fcn_map_type& m = q->second;
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1158
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1159 if (m.find (meth) != m.end ())
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1160 retval.push_back (q->first);
9458 0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1161 }
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1162
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1163 return retval;
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1164 }
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1165
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1166 std::string
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1167 load_path::do_find_file (const std::string& file) const
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1168 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1169 std::string retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1170
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	1171 if (file.find_first_of (file_ops::dir_sep_chars ()) != std::string::npos)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1172 {
6838 5e3350bdd91d [project @ 2007-08-28 02:59:58 by jwe] jwe parents: 6825 diff changeset	1173 if (octave_env::absolute_pathname (file)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1174 \|\| octave_env::rooted_relative_pathname (file))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1175 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1176 file_stat fs (file);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1177
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1178 if (fs.exists ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1179 return file;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1180 }
6838 5e3350bdd91d [project @ 2007-08-28 02:59:58 by jwe] jwe parents: 6825 diff changeset	1181 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1182 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1183 for (const_dir_info_list_iterator p = dir_info_list.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1184 p != dir_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1185 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1186 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1187 std::string tfile = file_ops::concat (p->dir_name, file);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1188
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1189 file_stat fs (tfile);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1190
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1191 if (fs.exists ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1192 return tfile;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1193 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1194 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1195 }
6838 5e3350bdd91d [project @ 2007-08-28 02:59:58 by jwe] jwe parents: 6825 diff changeset	1196 else
5e3350bdd91d [project @ 2007-08-28 02:59:58 by jwe] jwe parents: 6825 diff changeset	1197 {
5e3350bdd91d [project @ 2007-08-28 02:59:58 by jwe] jwe parents: 6825 diff changeset	1198 for (const_dir_info_list_iterator p = dir_info_list.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1199 p != dir_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1200 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1201 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1202 string_vector all_files = p->all_files;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1203
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1204 octave_idx_type len = all_files.length ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1205
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1206 for (octave_idx_type i = 0; i < len; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1207 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1208 if (all_files[i] == file)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1209 return file_ops::concat (p->dir_name, file);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1210 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1211 }
6838 5e3350bdd91d [project @ 2007-08-28 02:59:58 by jwe] jwe parents: 6825 diff changeset	1212 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1213
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1214 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1215 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1216
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1217 std::string
8041 a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1218 load_path::do_find_dir (const std::string& dir) const
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1219 {
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1220 std::string retval;
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1221
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1222 if (dir.find_first_of (file_ops::dir_sep_chars ()) != std::string::npos
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1223 && (octave_env::absolute_pathname (dir)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1224 \|\| octave_env::rooted_relative_pathname (dir)))
8041 a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1225 {
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1226 file_stat fs (dir);
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1227
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1228 if (fs.exists () && fs.is_dir ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1229 return dir;
8041 a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1230 }
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1231 else
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1232 {
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1233 for (const_dir_info_list_iterator p = dir_info_list.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1234 p != dir_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1235 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1236 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1237 std::string dname = octave_env::make_absolute (p->dir_name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1238
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1239 size_t dname_len = dname.length ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1240
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1241 if (dname.substr (dname_len - 1) == file_ops::dir_sep_str ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1242 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1243 dname = dname.substr (0, dname_len - 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1244 dname_len--;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1245 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1246
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1247 size_t dir_len = dir.length ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1248
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1249 if (dname_len >= dir_len
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1250 && file_ops::is_dir_sep (dname[dname_len - dir_len - 1])
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1251 && dir.compare (dname.substr (dname_len - dir_len)) == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1252 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1253 file_stat fs (p->dir_name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1254
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1255 if (fs.exists () && fs.is_dir ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1256 return p->dir_name;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1257 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1258 }
8041 a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1259 }
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1260
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1261 return retval;
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1262 }
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1263
9806 8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1264 string_vector
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1265 load_path::do_find_matching_dirs (const std::string& dir) const
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1266 {
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1267 std::list<std::string> retlist;
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1268
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1269 if (dir.find_first_of (file_ops::dir_sep_chars ()) != std::string::npos
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1270 && (octave_env::absolute_pathname (dir)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1271 \|\| octave_env::rooted_relative_pathname (dir)))
9806 8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1272 {
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1273 file_stat fs (dir);
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1274
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1275 if (fs.exists () && fs.is_dir ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1276 retlist.push_back (dir);
9806 8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1277 }
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1278 else
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1279 {
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1280 for (const_dir_info_list_iterator p = dir_info_list.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1281 p != dir_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1282 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1283 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1284 std::string dname = octave_env::make_absolute (p->dir_name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1285
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1286 size_t dname_len = dname.length ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1287
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1288 if (dname.substr (dname_len - 1) == file_ops::dir_sep_str ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1289 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1290 dname = dname.substr (0, dname_len - 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1291 dname_len--;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1292 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1293
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1294 size_t dir_len = dir.length ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1295
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1296 if (dname_len >= dir_len
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1297 && file_ops::is_dir_sep (dname[dname_len - dir_len - 1])
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1298 && dir.compare (dname.substr (dname_len - dir_len)) == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1299 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1300 file_stat fs (p->dir_name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1301
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1302 if (fs.exists () && fs.is_dir ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1303 retlist.push_back (p->dir_name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1304 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1305 }
9806 8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1306 }
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1307
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1308 return retlist;
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1309 }
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1310
8041 a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1311 std::string
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1312 load_path::do_find_first_of (const string_vector& flist) const
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1313 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1314 std::string retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1315
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1316 std::string dir_name;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1317 std::string file_name;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1318
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1319 octave_idx_type flen = flist.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1320 octave_idx_type rel_flen = 0;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1321
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1322 string_vector rel_flist (flen);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1323
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1324 for (octave_idx_type i = 0; i < flen; i++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1325 {
11105 a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1326 std::string file = flist[i];
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1327
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1328 if (file.find_first_of (file_ops::dir_sep_chars ()) != std::string::npos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1329 {
11105 a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1330 if (octave_env::absolute_pathname (file)
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1331 \|\| octave_env::rooted_relative_pathname (file))
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1332 {
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1333 file_stat fs (file);
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1334
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1335 if (fs.exists ())
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1336 return file;
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1337 }
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1338 else
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1339 {
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1340 for (const_dir_info_list_iterator p = dir_info_list.begin ();
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1341 p != dir_info_list.end ();
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1342 p++)
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1343 {
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1344 std::string tfile = file_ops::concat (p->dir_name, file);
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1345
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1346 file_stat fs (tfile);
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1347
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1348 if (fs.exists ())
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1349 return tfile;
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1350 }
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1351 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1352 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1353 else
11105 a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1354 rel_flist[rel_flen++] = file;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1355 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1356
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1357 rel_flist.resize (rel_flen);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1358
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1359 for (const_dir_info_list_iterator p = dir_info_list.begin ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1360 p != dir_info_list.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1361 p++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1362 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1363 string_vector all_files = p->all_files;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1364
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1365 octave_idx_type len = all_files.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1366
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1367 for (octave_idx_type i = 0; i < len; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1368 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1369 for (octave_idx_type j = 0; j < rel_flen; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1370 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1371 if (all_files[i] == rel_flist[j])
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1372 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1373 dir_name = p->dir_name;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1374 file_name = rel_flist[j];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1375
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1376 goto done;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1377 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1378 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1379 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1380 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1381
6159 645605133a6f [project @ 2006-11-14 02:55:05 by jwe] jwe parents: 6149 diff changeset	1382 done:
645605133a6f [project @ 2006-11-14 02:55:05 by jwe] jwe parents: 6149 diff changeset	1383
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1384 if (! dir_name.empty ())
7272 05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe] jwe parents: 7017 diff changeset	1385 retval = file_ops::concat (dir_name, file_name);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1386
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1387 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1388 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1389
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1390 string_vector
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1391 load_path::do_find_all_first_of (const string_vector& flist) const
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1392 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1393 std::list<std::string> retlist;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1394
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1395 std::string dir_name;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1396 std::string file_name;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1397
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1398 octave_idx_type flen = flist.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1399 octave_idx_type rel_flen = 0;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1400
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1401 string_vector rel_flist (flen);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1402
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1403 for (octave_idx_type i = 0; i < flen; i++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1404 {
11105 a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1405 std::string file = flist[i];
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1406
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1407 if (file.find_first_of (file_ops::dir_sep_chars ()) != std::string::npos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1408 {
11105 a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1409 if (octave_env::absolute_pathname (file)
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1410 \|\| octave_env::rooted_relative_pathname (file))
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1411 {
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1412 file_stat fs (file);
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1413
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1414 if (fs.exists ())
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1415 retlist.push_back (file);
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1416 }
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1417 else
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1418 {
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1419 for (const_dir_info_list_iterator p = dir_info_list.begin ();
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1420 p != dir_info_list.end ();
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1421 p++)
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1422 {
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1423 std::string tfile = file_ops::concat (p->dir_name, file);
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1424
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1425 file_stat fs (tfile);
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1426
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1427 if (fs.exists ())
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1428 retlist.push_back (tfile);
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1429 }
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1430 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1431 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1432 else
11105 a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1433 rel_flist[rel_flen++] = file;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1434 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1435
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1436 rel_flist.resize (rel_flen);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1437
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1438 for (const_dir_info_list_iterator p = dir_info_list.begin ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1439 p != dir_info_list.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1440 p++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1441 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1442 string_vector all_files = p->all_files;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1443
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1444 octave_idx_type len = all_files.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1445
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1446 for (octave_idx_type i = 0; i < len; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1447 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1448 for (octave_idx_type j = 0; j < rel_flen; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1449 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1450 if (all_files[i] == rel_flist[j])
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1451 retlist.push_back
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1452 (file_ops::concat (p->dir_name, rel_flist[j]));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1453 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1454 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1455 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1456
9807 645c478aa89d load-path.cc (load_path::do_find_all_first_of): take advantage of string_vector (std::list<std:string>) constructor John W. Eaton <jwe@octave.org> parents: 9806 diff changeset	1457 return retlist;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1458 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1459
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1460 string_vector
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1461 load_path::do_dirs (void) const
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1462 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1463 size_t len = dir_info_list.size ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1464
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1465 string_vector retval (len);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1466
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1467 octave_idx_type k = 0;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1468
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1469 for (const_dir_info_list_iterator i = dir_info_list.begin ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1470 i != dir_info_list.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1471 i++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1472 retval[k++] = i->dir_name;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1473
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1474 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1475 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1476
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1477 std::list<std::string>
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1478 load_path::do_dir_list (void) const
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1479 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1480 std::list<std::string> retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1481
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1482 for (const_dir_info_list_iterator i = dir_info_list.begin ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1483 i != dir_info_list.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1484 i++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1485 retval.push_back (i->dir_name);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1486
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1487 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1488 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1489
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1490 string_vector
9261 95445f9f5976 omit file extensions from __list_functions__ output John W. Eaton <jwe@octave.org> parents: 9105 diff changeset	1491 load_path::do_files (const std::string& dir, bool omit_exts) const
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1492 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1493 string_vector retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1494
9282 2ed8d2d92507 load_path::do_files: avoid shadow warning from GCC John W. Eaton <jwe@octave.org> parents: 9261 diff changeset	1495 const_dir_info_list_iterator p = find_dir_info (dir);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1496
9282 2ed8d2d92507 load_path::do_files: avoid shadow warning from GCC John W. Eaton <jwe@octave.org> parents: 9261 diff changeset	1497 if (p != dir_info_list.end ())
2ed8d2d92507 load_path::do_files: avoid shadow warning from GCC John W. Eaton <jwe@octave.org> parents: 9261 diff changeset	1498 retval = p->fcn_files;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1499
9261 95445f9f5976 omit file extensions from __list_functions__ output John W. Eaton <jwe@octave.org> parents: 9105 diff changeset	1500 if (omit_exts)
95445f9f5976 omit file extensions from __list_functions__ output John W. Eaton <jwe@octave.org> parents: 9105 diff changeset	1501 {
95445f9f5976 omit file extensions from __list_functions__ output John W. Eaton <jwe@octave.org> parents: 9105 diff changeset	1502 octave_idx_type len = retval.length ();
95445f9f5976 omit file extensions from __list_functions__ output John W. Eaton <jwe@octave.org> parents: 9105 diff changeset	1503
95445f9f5976 omit file extensions from __list_functions__ output John W. Eaton <jwe@octave.org> parents: 9105 diff changeset	1504 for (octave_idx_type i = 0; i < len; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1505 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1506 std::string fname = retval[i];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1507
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1508 size_t pos = fname.rfind ('.');
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1509
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1510 if (pos != std::string::npos)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1511 retval[i] = fname.substr (0, pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1512 }
9261 95445f9f5976 omit file extensions from __list_functions__ output John W. Eaton <jwe@octave.org> parents: 9105 diff changeset	1513 }
95445f9f5976 omit file extensions from __list_functions__ output John W. Eaton <jwe@octave.org> parents: 9105 diff changeset	1514
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1515 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1516 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1517
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1518 string_vector
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1519 load_path::do_fcn_names (void) const
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1520 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1521 size_t len = fcn_map.size ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1522
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1523 string_vector retval (len);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1524
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1525 octave_idx_type count = 0;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1526
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1527 for (const_fcn_map_iterator p = fcn_map.begin ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1528 p != fcn_map.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1529 p++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1530 retval[count++] = p->first;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1531
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1532 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1533 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1534
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1535 std::string
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1536 load_path::do_path (void) const
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1537 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1538 std::string xpath;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1539
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1540 string_vector xdirs = load_path::dirs ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1541
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1542 octave_idx_type len = xdirs.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1543
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1544 if (len > 0)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1545 xpath = xdirs[0];
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1546
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1547 for (octave_idx_type i = 1; i < len; i++)
8008 4d13a7a2f6ab dir_path: use singleton class for static data members John W. Eaton <jwe@octave.org> parents: 8007 diff changeset	1548 xpath += dir_path::path_sep_str () + xdirs[i];
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1549
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1550 return xpath;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1551 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1552
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1553 void
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1554 print_types (std::ostream& os, int types)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1555 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1556 bool printed_type = false;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1557
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1558 if (types & load_path::OCT_FILE)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1559 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1560 os << "oct";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1561 printed_type = true;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1562 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1563
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1564 if (types & load_path::MEX_FILE)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1565 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1566 if (printed_type)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1567 os << "\|";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1568 os << "mex";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1569 printed_type = true;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1570 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1571
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1572 if (types & load_path::M_FILE)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1573 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1574 if (printed_type)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1575 os << "\|";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1576 os << "m";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1577 printed_type = true;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1578 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1579 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1580
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1581 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1582 print_fcn_list (std::ostream& os,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1583 const load_path::dir_info::fcn_file_map_type& lst)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1584 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1585 for (load_path::dir_info::const_fcn_file_map_iterator p = lst.begin ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1586 p != lst.end ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1587 p++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1588 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1589 os << " " << p->first << " (";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1590
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1591 print_types (os, p->second);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1592
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1593 os << ")\n";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1594 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1595 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1596
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1597 string_vector
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1598 get_file_list (const load_path::dir_info::fcn_file_map_type& lst)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1599 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1600 octave_idx_type n = lst.size ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1601
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1602 string_vector retval (n);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1603
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1604 octave_idx_type count = 0;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1605
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1606 for (load_path::dir_info::const_fcn_file_map_iterator p = lst.begin ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1607 p != lst.end ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1608 p++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1609 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1610 std::string nm = p->first;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1611
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1612 int types = p->second;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1613
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1614 if (types & load_path::OCT_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1615 nm += ".oct";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1616 else if (types & load_path::MEX_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1617 nm += ".mex";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1618 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1619 nm += ".m";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1620
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1621 retval[count++] = nm;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1622 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1623
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1624 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1625 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1626
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1627 void
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1628 load_path::do_display (std::ostream& os) const
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1629 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1630 for (const_dir_info_list_iterator i = dir_info_list.begin ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1631 i != dir_info_list.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1632 i++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1633 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1634 string_vector fcn_files = i->fcn_files;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1635
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1636 if (! fcn_files.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1637 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1638 os << "\n*** function files in " << i->dir_name << ":\n\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1639
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1640 fcn_files.list_in_columns (os);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1641 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1642
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1643 const dir_info::method_file_map_type& method_file_map
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1644 = i->method_file_map;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1645
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1646 if (! method_file_map.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1647 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1648 for (dir_info::const_method_file_map_iterator p = method_file_map.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1649 p != method_file_map.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1650 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1651 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1652 os << "\n*** methods in " << i->dir_name
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1653 << "/@" << p->first << ":\n\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1654
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1655 const dir_info::class_info& ci = p->second;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1656
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1657 string_vector method_files = get_file_list (ci.method_file_map);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1658
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1659 method_files.list_in_columns (os);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1660 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1661 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1662 }
5864 e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe] jwe parents: 5854 diff changeset	1663
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1664 for (const_private_fcn_map_iterator i = private_fcn_map.begin ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1665 i != private_fcn_map.end (); i++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1666 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1667 os << "\n*** private functions in "
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1668 << file_ops::concat (i->first, "private") << ":\n\n";
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1669
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1670 print_fcn_list (os, i->second);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1671 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1672
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1673 #if defined (DEBUG_LOAD_PATH)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1674
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1675 for (const_fcn_map_iterator i = fcn_map.begin ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1676 i != fcn_map.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1677 i++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1678 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1679 os << i->first << ":\n";
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1680
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1681 const file_info_list_type& file_info_list = i->second;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1682
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1683 for (const_file_info_list_iterator p = file_info_list.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1684 p != file_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1685 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1686 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1687 os << " " << p->dir_name << " (";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1688
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1689 print_types (os, p->types);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1690
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1691 os << ")\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1692 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1693 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1694
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1695 for (const_method_map_iterator i = method_map.begin ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1696 i != method_map.end ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1697 i++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1698 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1699 os << "CLASS " << i->first << ":\n";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1700
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1701 const fcn_map_type& fm = i->second;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1702
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1703 for (const_fcn_map_iterator q = fm.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1704 q != fm.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1705 q++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1706 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1707 os << " " << q->first << ":\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1708
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1709 const file_info_list_type& file_info_list = q->second;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1710
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1711 for (const_file_info_list_iterator p = file_info_list.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1712 p != file_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1713 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1714 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1715 os << " " << p->dir_name << " (";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1716
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1717 print_types (os, p->types);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1718
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1719 os << ")\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1720 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1721 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1722 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1723
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1724 os << "\n";
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1725
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1726 #endif
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1727 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1728
10334 db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1729 // True if a path is contained in a path list separated by path_sep_char
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1730 static bool
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1731 in_path_list (const std::string& path_list, const std::string& path)
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1732 {
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1733 size_t ps = path.size (), pls = path_list.size (), pos = path_list.find (path);
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1734 char psc = dir_path::path_sep_char ();
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1735 while (pos != std::string::npos)
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1736 {
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1737 if ((pos == 0 \|\| path_list[pos-1] == psc)
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1738 && (pos + ps == pls \|\| path_list[pos + ps] == psc))
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1739 return true;
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1740 else
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1741 pos = path_list.find (path, pos + 1);
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1742 }
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1743
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1744 return false;
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1745 }
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1746
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1747 void
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1748 load_path::add_to_fcn_map (const dir_info& di, bool at_end) const
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1749 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1750 std::string dir_name = di.dir_name;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1751
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1752 string_vector fcn_files = di.fcn_files;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1753
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1754 octave_idx_type len = fcn_files.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1755
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1756 for (octave_idx_type i = 0; i < len; i++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1757 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1758 std::string fname = fcn_files[i];
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1759
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1760 std::string ext;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1761 std::string base = fname;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1762
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1763 size_t pos = fname.rfind ('.');
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1764
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	1765 if (pos != std::string::npos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1766 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1767 base = fname.substr (0, pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1768 ext = fname.substr (pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1769 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1770
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1771 file_info_list_type& file_info_list = fcn_map[base];
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1772
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1773 file_info_list_iterator p = file_info_list.begin ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1774
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1775 while (p != file_info_list.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1776 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1777 if (p->dir_name == dir_name)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1778 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1779
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1780 p++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1781 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1782
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1783 int t = 0;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1784 if (ext == ".m")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1785 t = load_path::M_FILE;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1786 else if (ext == ".oct")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1787 t = load_path::OCT_FILE;
5864 e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe] jwe parents: 5854 diff changeset	1788 else if (ext == ".mex")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1789 t = load_path::MEX_FILE;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1790
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1791 if (p == file_info_list.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1792 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1793 file_info fi (dir_name, t);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1794
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1795 if (at_end)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1796 file_info_list.push_back (fi);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1797 else
10242 4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1798 {
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1799 // Warn if a built-in or library function is being shadowed.
10446 ba932ad87a04 load_path::add_to_fcn_map: style fixes John W. Eaton <jwe@octave.org> parents: 10334 diff changeset	1800
10242 4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1801 if (! file_info_list.empty ())
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1802 {
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1803 file_info& old = file_info_list.front ();
10446 ba932ad87a04 load_path::add_to_fcn_map: style fixes John W. Eaton <jwe@octave.org> parents: 10334 diff changeset	1804
ba932ad87a04 load_path::add_to_fcn_map: style fixes John W. Eaton <jwe@octave.org> parents: 10334 diff changeset	1805 // FIXME -- do we need to be more careful about the
ba932ad87a04 load_path::add_to_fcn_map: style fixes John W. Eaton <jwe@octave.org> parents: 10334 diff changeset	1806 // way we look for old.dir_name in sys_path to avoid
ba932ad87a04 load_path::add_to_fcn_map: style fixes John W. Eaton <jwe@octave.org> parents: 10334 diff changeset	1807 // partial matches?
ba932ad87a04 load_path::add_to_fcn_map: style fixes John W. Eaton <jwe@octave.org> parents: 10334 diff changeset	1808
14884 f10cddda37c5 omit warning for multiple Contents.m files in the load path John W. Eaton <jwe@octave.org> parents: 14861 diff changeset	1809 // Don't warn about Contents.m files since we expect
f10cddda37c5 omit warning for multiple Contents.m files in the load path John W. Eaton <jwe@octave.org> parents: 14861 diff changeset	1810 // more than one to exist in the load path.
f10cddda37c5 omit warning for multiple Contents.m files in the load path John W. Eaton <jwe@octave.org> parents: 14861 diff changeset	1811
f10cddda37c5 omit warning for multiple Contents.m files in the load path John W. Eaton <jwe@octave.org> parents: 14861 diff changeset	1812 if (fname != "Contents.m"
f10cddda37c5 omit warning for multiple Contents.m files in the load path John W. Eaton <jwe@octave.org> parents: 14861 diff changeset	1813 && sys_path.find (old.dir_name) != std::string::npos
10446 ba932ad87a04 load_path::add_to_fcn_map: style fixes John W. Eaton <jwe@octave.org> parents: 10334 diff changeset	1814 && in_path_list (sys_path, old.dir_name))
10242 4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1815 {
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1816 std::string fcn_path = file_ops::concat (dir_name, fname);
10446 ba932ad87a04 load_path::add_to_fcn_map: style fixes John W. Eaton <jwe@octave.org> parents: 10334 diff changeset	1817
10242 4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1818 warning_with_id ("Octave:shadowed-function",
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11578 diff changeset	1819 "function %s shadows a core library function",
10242 4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1820 fcn_path.c_str ());
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1821 }
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1822 }
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1823 else if (symbol_table::is_built_in_function_name (base))
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1824 {
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1825 std::string fcn_path = file_ops::concat (dir_name, fname);
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1826 warning_with_id ("Octave:shadowed-function",
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11578 diff changeset	1827 "function %s shadows a built-in function",
10242 4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1828 fcn_path.c_str ());
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1829 }
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1830
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1831 file_info_list.push_front (fi);
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1832 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1833 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1834 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1835 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1836 file_info& fi = *p;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1837
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1838 fi.types \|= t;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1839 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1840 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1841 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1842
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1843 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1844 load_path::add_to_private_fcn_map (const dir_info& di) const
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1845 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1846 dir_info::fcn_file_map_type private_file_map = di.private_file_map;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1847
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1848 if (! private_file_map.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1849 private_fcn_map[di.dir_name] = private_file_map;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1850 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1851
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1852 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1853 load_path::add_to_method_map (const dir_info& di, bool at_end) const
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1854 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1855 std::string dir_name = di.dir_name;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1856
7971 dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	1857 // <CLASS_NAME, CLASS_INFO>
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1858 dir_info::method_file_map_type method_file_map = di.method_file_map;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1859
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1860 for (dir_info::const_method_file_map_iterator q = method_file_map.begin ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1861 q != method_file_map.end ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1862 q++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1863 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1864 std::string class_name = q->first;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1865
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1866 fcn_map_type& fm = method_map[class_name];
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1867
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1868 std::string full_dir_name
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1869 = file_ops::concat (dir_name, "@" + class_name);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1870
7971 dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	1871 const dir_info::class_info& ci = q->second;
dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	1872
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1873 // <FCN_NAME, TYPES>
7971 dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	1874 const dir_info::fcn_file_map_type& m = ci.method_file_map;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1875
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1876 for (dir_info::const_fcn_file_map_iterator p = m.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1877 p != m.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1878 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1879 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1880 std::string base = p->first;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1881
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1882 int types = p->second;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1883
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1884 file_info_list_type& file_info_list = fm[base];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1885
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1886 file_info_list_iterator p2 = file_info_list.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1887
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1888 while (p2 != file_info_list.end ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1889 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1890 if (p2->dir_name == full_dir_name)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1891 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1892
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1893 p2++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1894 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1895
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1896 if (p2 == file_info_list.end ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1897 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1898 file_info fi (full_dir_name, types);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1899
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1900 if (at_end)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1901 file_info_list.push_back (fi);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1902 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1903 file_info_list.push_front (fi);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1904 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1905 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1906 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1907 // FIXME -- is this possible?
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1908
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1909 file_info& fi = *p2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1910
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1911 fi.types = types;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1912 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1913 }
7971 dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	1914
dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	1915 // <FCN_NAME, TYPES>
dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	1916 dir_info::fcn_file_map_type private_file_map = ci.private_file_map;
dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	1917
dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	1918 if (! private_file_map.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1919 private_fcn_map[full_dir_name] = private_file_map;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1920 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1921 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1922
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1923 std::string
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1924 genpath (const std::string& dirname, const string_vector& skip)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1925 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1926 std::string retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1927
5871 b9fd54407c8d [project @ 2006-06-30 16:48:39 by jwe] jwe parents: 5867 diff changeset	1928 dir_entry dir (dirname);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1929
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1930 if (dir)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1931 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1932 retval = dirname;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1933
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1934 string_vector dirlist = dir.read ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11578 diff changeset	1935
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1936 octave_idx_type len = dirlist.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1937
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1938 for (octave_idx_type i = 0; i < len; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1939 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1940 std::string elt = dirlist[i];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1941
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1942 bool skip_p = (elt == "." \|\| elt == ".." \|\| elt[0] == '@');
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1943
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1944 if (! skip_p)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1945 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1946 for (octave_idx_type j = 0; j < skip.length (); j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1947 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1948 skip_p = (elt == skip[j]);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1949 if (skip_p)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1950 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1951 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1952
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1953 if (! skip_p)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1954 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1955 std::string nm = file_ops::concat (dirname, elt);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1956
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1957 file_stat fs (nm);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1958
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1959 if (fs && fs.is_dir ())
10971 386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	1960 retval += dir_path::path_sep_str () + genpath (nm, skip);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1961 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1962 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1963 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1964 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1965
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1966 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1967 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1968
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1969 static void
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1970 execute_pkg_add_or_del (const std::string& dir,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1971 const std::string& script_file)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1972 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1973 if (! octave_interpreter_ready)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1974 return;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1975
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9807 diff changeset	1976 unwind_protect frame;
2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9807 diff changeset	1977
7272 05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe] jwe parents: 7017 diff changeset	1978 std::string file = file_ops::concat (dir, script_file);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1979
5978 32cef2cfc9c9 [project @ 2006-08-31 02:31:57 by jwe] jwe parents: 5975 diff changeset	1980 file_stat fs (file);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1981
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1982 if (fs.exists ())
5975 e64059303a6f [project @ 2006-08-29 16:37:39 by jwe] jwe parents: 5919 diff changeset	1983 source_file (file, "base");
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1984 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1985
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1986 void
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1987 execute_pkg_add (const std::string& dir)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1988 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1989 execute_pkg_add_or_del (dir, "PKG_ADD");
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1990 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1991
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1992 void
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1993 execute_pkg_del (const std::string& dir)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1994 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1995 execute_pkg_add_or_del (dir, "PKG_DEL");
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1996 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1997
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1998 DEFUN (genpath, args, ,
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1999 "-- texinfo --\n\
11572 7d6d8c1e471f Grammarcheck Texinfo for files in src directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	2000 @deftypefn {Built-in Function} {} genpath (@var{dir})\n\
10971 386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2001 @deftypefnx {Built-in Function} {} genpath (@var{dir}, @var{skip}, @dots{})\n\
8325 b93ac0586e4b spelling corrections Brian Gough<bjg@network-theory.co.uk> parents: 8141 diff changeset	2002 Return a path constructed from @var{dir} and all its subdirectories.\n\
12642 f96b9b9f141b doc: Periodic grammarcheck and spellcheck of documentation. Rik <octave@nomad.inbox5.com> parents: 12632 diff changeset	2003 If additional string parameters are given, the resulting path will\n\
11572 7d6d8c1e471f Grammarcheck Texinfo for files in src directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	2004 exclude directories with those names.\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2005 @end deftypefn")
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2006 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2007 octave_value retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2008
10971 386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2009 octave_idx_type nargin = args.length ();
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2010
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2011 if (nargin == 1)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2012 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2013 std::string dirname = args(0).string_value ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2014
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2015 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2016 retval = genpath (dirname);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2017 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12438 diff changeset	2018 error ("genpath: DIR must be a character string");
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2019 }
10971 386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2020 else if (nargin > 1)
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2021 {
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2022 std::string dirname = args(0).string_value ();
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2023
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2024 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	2025
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2026 for (octave_idx_type i = 1; i < nargin; i++)
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2027 {
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2028 skip[i-1] = args(i).string_value ();
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2029
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2030 if (error_state)
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2031 break;
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2032 }
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2033
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2034 if (! error_state)
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2035 retval = genpath (dirname, skip);
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2036 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12438 diff changeset	2037 error ("genpath: all arguments must be character strings");
10971 386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	2038 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2039 else
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2040 print_usage ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2041
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2042 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2043 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2044
9105 9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2045 static void
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2046 rehash_internal (void)
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2047 {
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2048 load_path::update ();
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2049
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2050 // FIXME -- maybe we should rename this variable since it is being
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2051 // used for more than keeping track of the prompt time.
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2052
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2053 // This will force updated functions to be found.
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2054 Vlast_prompt_time.stamp ();
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2055 }
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2056
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2057 DEFUN (rehash, , ,
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2058 "-- texinfo --\n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2059 @deftypefn {Built-in Function} {} rehash ()\n\
6644 004561c38e8f [project @ 2007-05-21 20:59:26 by jwe] jwe parents: 6630 diff changeset	2060 Reinitialize Octave's load path directory cache.\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2061 @end deftypefn")
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2062 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2063 octave_value_list retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2064
9105 9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2065 rehash_internal ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2066
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2067 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2068 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2069
8609 fcf762ba66cf load-path.cc (Fcommand_line_path): rename from Fcommandlinepath John W. Eaton <jwe@octave.org> parents: 8593 diff changeset	2070 DEFUN (command_line_path, , ,
8586 31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2071 "-- texinfo --\n\
8609 fcf762ba66cf load-path.cc (Fcommand_line_path): rename from Fcommandlinepath John W. Eaton <jwe@octave.org> parents: 8593 diff changeset	2072 @deftypefn {Built-in Function} {} command_line_path (@dots{})\n\
8586 31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2073 Return the command line path variable.\n\
31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2074 \n\
31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2075 @seealso{path, addpath, rmpath, genpath, pathdef, savepath, pathsep}\n\
31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2076 @end deftypefn")
31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2077 {
31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2078 return octave_value (load_path::get_command_line_path ());
31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2079 }
31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2080
7391 f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2081 DEFUN (restoredefaultpath, , ,
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2082 "-- texinfo --\n\
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2083 @deftypefn {Built-in Function} {} restoredefaultpath (@dots{})\n\
12601 99babbf683ff doc: Correct use of it's -> its in documentation. Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	2084 Restore Octave's path to its initial state at startup.\n\
7391 f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2085 \n\
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2086 @seealso{path, addpath, rmpath, genpath, pathdef, savepath, pathsep}\n\
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2087 @end deftypefn")
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2088 {
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2089 load_path::initialize (true);
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2090
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2091 return octave_value (load_path::system_path ());
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2092 }
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2093
8812 7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8746 diff changeset	2094 // 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	2095 // 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	2096 // 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	2097 // ~/.octaverc file
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8746 diff changeset	2098
7391 f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2099 DEFUN (__pathorig__, , ,
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2100 "-- texinfo --\n\
7391 f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2101 @deftypefn {Built-in Function} {@var{val} =} __pathorig__ ()\n\
8812 7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8746 diff changeset	2102 Undocumented internal function.\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2103 @end deftypefn")
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2104 {
6630 0fcc8d65b571 [project @ 2007-05-16 15:32:09 by jwe] jwe parents: 6626 diff changeset	2105 return octave_value (load_path::system_path ());
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2106 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2107
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2108 DEFUN (path, args, nargout,
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2109 "-- texinfo --\n\
6678 49724abe1236 [project @ 2007-05-31 19:44:45 by jwe] jwe parents: 6644 diff changeset	2110 @deftypefn {Built-in Function} {} path (@dots{})\n\
6644 004561c38e8f [project @ 2007-05-21 20:59:26 by jwe] jwe parents: 6630 diff changeset	2111 Modify or display Octave's load path.\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2112 \n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2113 If @var{nargin} and @var{nargout} are zero, display the elements of\n\
6644 004561c38e8f [project @ 2007-05-21 20:59:26 by jwe] jwe parents: 6630 diff changeset	2114 Octave's load path in an easy to read format.\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2115 \n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2116 If @var{nargin} is zero and nargout is greater than zero, return the\n\
6644 004561c38e8f [project @ 2007-05-21 20:59:26 by jwe] jwe parents: 6630 diff changeset	2117 current load path.\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2118 \n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2119 If @var{nargin} is greater than zero, concatenate the arguments,\n\
10980 1cbfb15892c9 addpath, rmpath: document path arguments John W. Eaton <jwe@octave.org> parents: 10971 diff changeset	2120 separating them with @code{pathsep}. Set the internal search path\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2121 to the result and return it.\n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2122 \n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2123 No checks are made for duplicate elements.\n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2124 @seealso{addpath, rmpath, genpath, pathdef, savepath, pathsep}\n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2125 @end deftypefn")
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2126 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2127 octave_value retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2128
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2129 int argc = args.length () + 1;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2130
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2131 string_vector argv = args.make_argv ("path");
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2132
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2133 if (! error_state)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2134 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2135 if (argc > 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2136 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2137 std::string path = argv[1];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2138
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2139 for (int i = 2; i < argc; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2140 path += dir_path::path_sep_str () + argv[i];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2141
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2142 load_path::set (path, true);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2143
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2144 rehash_internal ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2145 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2146
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2147 if (nargout > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2148 retval = load_path::path ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2149 else if (argc == 1 && nargout == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2150 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2151 octave_stdout << "\nOctave's search path contains the following directories:\n\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2152
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2153 string_vector dirs = load_path::dirs ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2154
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2155 dirs.list_in_columns (octave_stdout);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2156
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2157 octave_stdout << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2158 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2159 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2160
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2161 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2162 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2163
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8704 diff changeset	2164 DEFUN (addpath, args, nargout,
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2165 "-- texinfo --\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10521 diff changeset	2166 @deftypefn {Built-in Function} {} addpath (@var{dir1}, @dots{})\n\
6678 49724abe1236 [project @ 2007-05-31 19:44:45 by jwe] jwe parents: 6644 diff changeset	2167 @deftypefnx {Built-in Function} {} addpath (@var{dir1}, @dots{}, @var{option})\n\
16567 68176102fe07 * load-path.cc (Faddpath): Doc fix. John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2168 Add named directories to the function search path. If\n\
12632 2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12601 diff changeset	2169 @var{option} is \"-begin\" or 0 (the default), prepend the\n\
2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12601 diff changeset	2170 directory name to the current path. If @var{option} is \"-end\"\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2171 or 1, append the directory name to the current path.\n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2172 Directories added to the path must exist.\n\
10980 1cbfb15892c9 addpath, rmpath: document path arguments John W. Eaton <jwe@octave.org> parents: 10971 diff changeset	2173 \n\
1cbfb15892c9 addpath, rmpath: document path arguments John W. Eaton <jwe@octave.org> parents: 10971 diff changeset	2174 In addition to accepting individual directory arguments, lists of\n\
11572 7d6d8c1e471f Grammarcheck Texinfo for files in src directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	2175 directory names separated by @code{pathsep} are also accepted. For example:\n\
10980 1cbfb15892c9 addpath, rmpath: document path arguments John W. Eaton <jwe@octave.org> parents: 10971 diff changeset	2176 \n\
1cbfb15892c9 addpath, rmpath: document path arguments John W. Eaton <jwe@octave.org> parents: 10971 diff changeset	2177 @example\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2178 addpath (\"dir1:/dir2:~/dir3\")\n\
10980 1cbfb15892c9 addpath, rmpath: document path arguments John W. Eaton <jwe@octave.org> parents: 10971 diff changeset	2179 @end example\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2180 @seealso{path, rmpath, genpath, pathdef, savepath, pathsep}\n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2181 @end deftypefn")
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2182 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2183 octave_value retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2184
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2185 // Originally written by Bill Denney and Etienne Grossman. Heavily
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2186 // modified and translated to C++ by jwe.
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2187
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2188 if (nargout > 0)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2189 retval = load_path::path ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2190
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2191 int nargin = args.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2192
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2193 if (nargin > 0)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2194 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2195 bool append = false;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2196
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2197 octave_value option_arg = args(nargin-1);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2198
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2199 if (option_arg.is_string ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2200 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2201 std::string option = option_arg.string_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2202
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2203 if (option == "-end")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2204 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2205 append = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2206 nargin--;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2207 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2208 else if (option == "-begin")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2209 nargin--;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2210 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2211 else if (option_arg.is_numeric_type ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2212 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2213 int val = option_arg.int_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2214
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2215 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2216 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2217 if (val == 0)
10957 27efbc0733f2 addpath: accept numeric option arguments as documented John W. Eaton <jwe@octave.org> parents: 10907 diff changeset	2218 nargin--;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2219 else if (val == 1)
10957 27efbc0733f2 addpath: accept numeric option arguments as documented John W. Eaton <jwe@octave.org> parents: 10907 diff changeset	2220 {
27efbc0733f2 addpath: accept numeric option arguments as documented John W. Eaton <jwe@octave.org> parents: 10907 diff changeset	2221 append = true;
27efbc0733f2 addpath: accept numeric option arguments as documented John W. Eaton <jwe@octave.org> parents: 10907 diff changeset	2222 nargin--;
27efbc0733f2 addpath: accept numeric option arguments as documented John W. Eaton <jwe@octave.org> parents: 10907 diff changeset	2223 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2224 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2225 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2226 error ("addpath: expecting final argument to be 1 or 0");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2227 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2228 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2229 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2230 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2231 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2232 error ("addpath: expecting final argument to be 1 or 0");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2233 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2234 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2235 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2236
9105 9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2237 bool need_to_update = false;
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2238
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2239 for (int i = 0; i < nargin; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2240 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2241 std::string arg = args(i).string_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2242
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2243 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2244 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2245 std::list<std::string> dir_elts = split_path (arg);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2246
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2247 if (! append)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2248 std::reverse (dir_elts.begin (), dir_elts.end ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2249
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2250 for (std::list<std::string>::const_iterator p = dir_elts.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2251 p != dir_elts.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2252 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2253 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2254 std::string dir = *p;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2255
11032 c9b0a75b02e8 Make all regexp in Octave compatible with both POSIX and PCRE. Rik <octave@nomad.inbox5.com> parents: 10982 diff changeset	2256 //dir = regexprep (dir_elts{j}, '//+', "/");
c9b0a75b02e8 Make all regexp in Octave compatible with both POSIX and PCRE. Rik <octave@nomad.inbox5.com> parents: 10982 diff changeset	2257 //dir = regexprep (dir, '/$', "");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2258
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2259 if (append)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2260 load_path::append (dir, true);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2261 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2262 load_path::prepend (dir, true);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2263
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2264 need_to_update = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2265 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2266 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2267 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12438 diff changeset	2268 error ("addpath: all arguments must be character strings");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2269 }
9105 9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2270
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2271 if (need_to_update)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2272 rehash_internal ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2273 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2274 else
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2275 print_usage ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2276
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2277 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2278 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2279
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8704 diff changeset	2280 DEFUN (rmpath, args, nargout,
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2281 "-- texinfo --\n\
6678 49724abe1236 [project @ 2007-05-31 19:44:45 by jwe] jwe parents: 6644 diff changeset	2282 @deftypefn {Built-in Function} {} rmpath (@var{dir1}, @dots{})\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2283 Remove @var{dir1}, @dots{} from the current function search path.\n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2284 \n\
10980 1cbfb15892c9 addpath, rmpath: document path arguments John W. Eaton <jwe@octave.org> parents: 10971 diff changeset	2285 In addition to accepting individual directory arguments, lists of\n\
11572 7d6d8c1e471f Grammarcheck Texinfo for files in src directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	2286 directory names separated by @code{pathsep} are also accepted. For example:\n\
10980 1cbfb15892c9 addpath, rmpath: document path arguments John W. Eaton <jwe@octave.org> parents: 10971 diff changeset	2287 \n\
1cbfb15892c9 addpath, rmpath: document path arguments John W. Eaton <jwe@octave.org> parents: 10971 diff changeset	2288 @example\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2289 rmpath (\"dir1:/dir2:~/dir3\")\n\
10980 1cbfb15892c9 addpath, rmpath: document path arguments John W. Eaton <jwe@octave.org> parents: 10971 diff changeset	2290 @end example\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2291 @seealso{path, addpath, genpath, pathdef, savepath, pathsep}\n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2292 @end deftypefn")
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 // Originally by Etienne Grossmann. Heavily modified and translated
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2295 // to C++ by jwe.
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2296
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2297 octave_value retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2298
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2299 if (nargout > 0)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2300 retval = load_path::path ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2301
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2302 int nargin = args.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2303
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2304 if (nargin > 0)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2305 {
9105 9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2306 bool need_to_update = false;
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2307
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2308 for (int i = 0; i < nargin; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2309 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2310 std::string arg = args(i).string_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2311
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2312 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2313 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2314 std::list<std::string> dir_elts = split_path (arg);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2315
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2316 for (std::list<std::string>::const_iterator p = dir_elts.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2317 p != dir_elts.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2318 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2319 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2320 std::string dir = *p;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2321
11032 c9b0a75b02e8 Make all regexp in Octave compatible with both POSIX and PCRE. Rik <octave@nomad.inbox5.com> parents: 10982 diff changeset	2322 //dir = regexprep (dir_elts{j}, '//+', "/");
c9b0a75b02e8 Make all regexp in Octave compatible with both POSIX and PCRE. Rik <octave@nomad.inbox5.com> parents: 10982 diff changeset	2323 //dir = regexprep (dir, '/$', "");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2324
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2325 if (! load_path::remove (dir))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2326 warning ("rmpath: %s: not found", dir.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2327 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2328 need_to_update = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2329 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2330 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2331 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12438 diff changeset	2332 error ("addpath: all arguments must be character strings");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2333 }
9105 9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2334
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2335 if (need_to_update)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2336 rehash_internal ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2337 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2338 else
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2339 print_usage ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2340
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2341 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2342 }

Mercurial > octave-nkf

annotate libinterp/interpfcn/load-path.cc @ 16567:68176102fe07