octave-nkf: src/load-path.cc annotate

annotate src/load-path.cc @ 13983:7dd7cccf0757

clean up memory allocated for singletons before exit * singleton-cleanup.h, singleton-cleanup.cc: New files. * liboctave/Makefile.am (INCS, LIBOCTAVE_CXX_SOURCES): Add them to the lists. * toplev.cc (clean_up_and_exit): Call singleton_cleanup_list::cleanup. * debug.h, debug.cc (bp_table::instance_ok): Move definition to debug.cc. * coment-list.h (octave_comment_buffer::~octave_comment_buffer): Define destructor for class. * ov-typeinfo.h (octave_value_typeinfo::~octave_value_typeinfo): Likewise. * cmd-edit.h (command_editor::cleanup_instance): New function. * cmd-hist.h (command_history::cleanup_instance): New function. * file-ops.h (file_ops::cleanup_instance): New function. * mach-info.h (oct_mach_info::cleanup_instance): New function. * oct-env.h (octave_env::cleanup_instance): New function. * oct-fftw.h (octave_fftw_planner::cleanup_instance): New function. * oct-rand.h (octave_rand::cleanup_instance): New function. * oct-spparms.h (octave_sparse_params::cleanup_instance): New function. * pathsearch.h (static_members::cleanup_instance): New function. * comment-list.h (octave_comment_buffer::cleanup_instance): New function. * debug.h (bp_table::cleanup_instance): New function. * display.h (display_info::cleanup_instance): New function. * dynamic-ld.cc (octave_shlib_list::cleanup_instance, octave_mex_file_list::cleanup_instance): New functions. * dynamic-ld.h (octave_dynamic_loader::cleanup_instance): New function. * load-path.h (load_path::cleanup_instance): New function. * oct-stream.h (octave_stream_list::cleanup_instance): New function. * ov-typeinfo.h (octave_value_typeinfo::cleanup_instance): New function. * pager.h, pager.cc (octave_pager_stream::instance_ok, octave_pager_stream::cleanup_instance): New functions. (octave_diary_stream::instance_ok, octave_diary_stream::cleanup_instance): New functions. * sighandlers.h (octave_child_list::cleanup_instance): New function. * toplev.h (octave_call_stack * pager.cc (octave_pager_stream::stream, octave_diary_stream::stream): Use instance_ok to create instance. * toplev.h (octave_call_stack::cleanup_instance): New function. * cmd-edit.cc (command_editor::instance_ok): Register cleanup function. * cmd-hist.cc (command_history::instance_ok): Likewise. * file-ops.cc (file_ops::instance_ok): Likewise. * mach-info.cc (oct_mach_info::instance_ok): Likewise. * oct-env.cc (octave_env::instance_ok): Likewise. * oct-fftw.cc (octave_fftw_planner::instance_ok): Likewise. * oct-rand.cc (octave_rand::instance_ok): Likewise. * oct-spparms.cc (octave_sparse_params::instance_ok): Likewise. * pathsearch.cc (dir_path::static_members::instance_ok): Likewise. * comment-list.cc (comment_list::instance_ok): Likewise. * debug.cc (bp_table::instance_ok): Likewise. * display.cc (display_info::instance_ok): Likewise. * dynamic-ld.cc (octave_shlib_list::instance_ok, octave_mex_file_list::instance_ok, octave_dynamic_loader): Likewise. * load-path.cc (load_path::instance_ok): Likewise. * oct-stream.cc (octave_stream_list::instance_ok): Likewise. * ov-typeinfo.cc (octave_value_typeinfo::instance_ok): Likewise. * sighandlers.cc (octave_child_list::instance_ok): Likewise. * symtab.h, symtab.cc (symbol_table::scope_id::create_instance): New function. * symtab.h (symbol_table::scope_id::instance_ok): Call create_instance. * toplev.h, toplev.cc (octave_call_stack::create_instance): New function. * toplev.cc (octave_call_stack::instance_ok): Call create_instance. * pager.h, pager.cc (octave_pager_stream::set_diary_skip, octave_pager_stream::flush_current_contents_to_diary): Now static. octave_pager_stream::do_set_diary_skip, octave_pager_stream::do_flush_current_contents_to_diary): New functions. (octave_pager_stream::stream): Return std::ostream&, not octave_pager_stream&. If instance creation fails, return std::cout. (octave_diary_stream::stream): Return std::ostream&, not octave_diary_stream&. If instance creation fails, return std::cout. (octave_pager_stream::do_reset, octave_diary_stream::do_reset): Use instance_ok to create instance.

author	John W. Eaton <jwe@octave.org>
date	Sat, 03 Dec 2011 04:34:17 -0500
parents	f96b9b9f141b
children	72c96de7a403

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
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 11105 diff changeset	3 Copyright (C) 2006-2011 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
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	356 void
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	357 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	358 const string_vector& fcn_files, bool at_end)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	359 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	360 octave_idx_type len = fcn_files.length ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	361
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	362 for (octave_idx_type k = 0; k < len; k++)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	363 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	364 std::string fname = fcn_files[k];
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	365
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	366 std::string ext;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	367 std::string base = fname;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	368
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	369 size_t pos = fname.rfind ('.');
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	370
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	371 if (pos != std::string::npos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	372 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	373 base = fname.substr (0, pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	374 ext = fname.substr (pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	375 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	376
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	377 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	378
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	379 if (file_info_list.size () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	380 continue;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	381 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	382 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	383 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	384 p != file_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	385 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	386 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	387 if (p->dir_name == dir_name)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	388 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	389 file_info fi = *p;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	390
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	391 file_info_list.erase (p);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	392
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	393 if (at_end)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	394 file_info_list.push_back (fi);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	395 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	396 file_info_list.push_front (fi);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	397
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	398 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	399 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	400 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	401 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	402 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	403 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	404
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	405 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	406 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	407 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	408 for (method_map_iterator i = method_map.begin ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	409 i != method_map.end ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	410 i++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	411 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	412 std::string class_name = i->first;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	413
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	414 fcn_map_type& fm = i->second;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	415
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	416 std::string full_dir_name
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	417 = file_ops::concat (dir_name, "@" + class_name);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	418
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	419 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	420 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	421 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	422
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	423 if (file_info_list.size () == 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	424 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	425 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	426 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	427 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	428 p != file_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	429 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	430 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	431 if (p->dir_name == full_dir_name)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	432 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	433 file_info fi = *p;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	434
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	435 file_info_list.erase (p);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	436
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	437 if (at_end)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	438 file_info_list.push_back (fi);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	439 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	440 file_info_list.push_front (fi);
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 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	443 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	444 }
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 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	447 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	448 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	449
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	450 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	451 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	452 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	453 if (dir_info_list.size () > 1)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	454 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	455 dir_info di = *i;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	456
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	457 dir_info_list.erase (i);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	458
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	459 if (at_end)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	460 dir_info_list.push_back (di);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	461 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	462 dir_info_list.push_front (di);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	463
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	464 std::string dir_name = di.dir_name;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	465
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	466 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	467
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	468 // No need to move elements of private function map.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	469
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	470 move_method_map (dir_name, 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 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	473
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	474 static void
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	475 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	476 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	477 std::string tpath = genpath (dir);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	478
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	479 if (! tpath.empty ())
7374 4ff9611147ba [project @ 2008-01-15 00:50:50 by jwe] jwe parents: 7336 diff changeset	480 {
4ff9611147ba [project @ 2008-01-15 00:50:50 by jwe] jwe parents: 7336 diff changeset	481 if (path.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	482 path = tpath;
7374 4ff9611147ba [project @ 2008-01-15 00:50:50 by jwe] jwe parents: 7336 diff changeset	483 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	484 path += dir_path::path_sep_str () + tpath;
7374 4ff9611147ba [project @ 2008-01-15 00:50:50 by jwe] jwe parents: 7336 diff changeset	485 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	486 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	487
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	488 void
6365 ccdb8ffbb994 [project @ 2007-02-27 19:43:35 by jwe] jwe parents: 6196 diff changeset	489 load_path::do_initialize (bool set_initial_path)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	490 {
7374 4ff9611147ba [project @ 2008-01-15 00:50:50 by jwe] jwe parents: 7336 diff changeset	491 sys_path = "";
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	492
6365 ccdb8ffbb994 [project @ 2007-02-27 19:43:35 by jwe] jwe parents: 6196 diff changeset	493 if (set_initial_path)
ccdb8ffbb994 [project @ 2007-02-27 19:43:35 by jwe] jwe parents: 6196 diff changeset	494 {
6626 af16354ea09c [project @ 2007-05-16 14:58:26 by jwe] jwe parents: 6625 diff changeset	495 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	496 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	497 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	498 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	499 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	500 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	501 maybe_add_path_elts (sys_path, Voct_file_dir);
af16354ea09c [project @ 2007-05-16 14:58:26 by jwe] jwe parents: 6625 diff changeset	502 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	503 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	504
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	505 std::string tpath = load_path::command_line_path;
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 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	508 tpath = octave_env::getenv ("OCTAVE_PATH");
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	509
10242 4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	510 std::string xpath;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	511
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	512 if (! tpath.empty ())
10242 4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	513 {
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	514 xpath = tpath;
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	515
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	516 if (! sys_path.empty ())
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	517 xpath += dir_path::path_sep_str () + sys_path;
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	518 }
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	519 else
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	520 xpath = sys_path;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	521
6119 fabb1be5fd84 [project @ 2006-10-28 00:13:58 by jwe] jwe parents: 5978 diff changeset	522 do_set (xpath, false);
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
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	525 void
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	526 load_path::do_clear (void)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	527 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	528 dir_info_list.clear ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	529 fcn_map.clear ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	530 private_fcn_map.clear ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	531 method_map.clear ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	532 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	533
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	534 static std::list<std::string>
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	535 split_path (const std::string& p)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	536 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	537 std::list<std::string> retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	538
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	539 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	540 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	541
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	542 size_t len = p.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	543
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	544 while (end != std::string::npos)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	545 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	546 std::string elt = p.substr (beg, end-beg);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	547
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	548 if (! elt.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	549 retval.push_back (elt);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	550
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	551 beg = end + 1;
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 if (beg == len)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	554 break;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	555
8008 4d13a7a2f6ab dir_path: use singleton class for static data members John W. Eaton <jwe@octave.org> parents: 8007 diff changeset	556 end = p.find (dir_path::path_sep_char (), beg);
5832 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
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	559 std::string elt = p.substr (beg);
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 if (! elt.empty ())
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	562 retval.push_back (elt);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	563
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	564 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	565 }
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 void
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	568 load_path::do_set (const std::string& p, bool warn)
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 std::list<std::string> elts = split_path (p);
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 // Temporarily disable add hook.
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	573
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9807 diff changeset	574 unwind_protect frame;
2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9807 diff changeset	575 frame.protect_var (add_hook);
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 add_hook = 0;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	578
8511 a835406e02dd load_path::do_set: call clear after disabling add_hook John W. Eaton <jwe@octave.org> parents: 8331 diff changeset	579 do_clear ();
a835406e02dd load_path::do_set: call clear after disabling add_hook John W. Eaton <jwe@octave.org> parents: 8331 diff changeset	580
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	581 for (std::list<std::string>::const_iterator i = elts.begin ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	582 i != elts.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	583 i++)
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	584 do_append (*i, warn);
5832 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 // Restore add hook and execute for all newly added directories.
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9807 diff changeset	587 frame.run_top ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	588
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	589 for (dir_info_list_iterator i = dir_info_list.begin ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	590 i != dir_info_list.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	591 i++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	592 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	593 if (add_hook)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	594 add_hook (i->dir_name);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	595 }
10242 4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	596
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	597 // Always prepend current directory.
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	598 do_prepend (".", warn);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	599 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	600
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	601 void
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	602 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	603 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	604 if (! dir.empty ())
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	605 do_add (dir, true, warn);
b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	606 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	607
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	608 void
b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	609 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	610 {
b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	611 if (! dir.empty ())
b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	612 do_add (dir, false, warn);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	613 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	614
11578 06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	615 // 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	616
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	617 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	618 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	619 {
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	620 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	621
12438 ab4c6bbff14a use correct type for std::string length John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	622 size_t k = dir.length ();
ab4c6bbff14a use correct type for std::string length John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	623
11578 06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	624 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	625 k--;
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	626
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	627 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	628 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	629
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	630 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	631 }
06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	632
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	633 void
5919 ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	634 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	635 {
5919 ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	636 size_t len = dir_arg.length ();
5911 a65b51ed388c [project @ 2006-07-28 16:31:00 by jwe] jwe parents: 5871 diff changeset	637
5919 ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	638 if (len > 1 && dir_arg.substr (len-2) == "//")
5911 a65b51ed388c [project @ 2006-07-28 16:31:00 by jwe] jwe parents: 5871 diff changeset	639 warning_with_id ("Octave:recursive-path-search",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	640 "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	641
5919 ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	642 std::string dir = file_ops::tilde_expand (dir_arg);
ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	643
11578 06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	644 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	645
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	646 dir_info_list_iterator i = find_dir_info (dir);
b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	647
b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	648 if (i != dir_info_list.end ())
b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	649 move (i, at_end);
b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	650 else
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	651 {
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	652 file_stat fs (dir);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	653
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	654 if (fs)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	655 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	656 if (fs.is_dir ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	657 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	658 dir_info di (dir);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	659
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	660 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	661 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	662 if (at_end)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	663 dir_info_list.push_back (di);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	664 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	665 dir_info_list.push_front (di);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	666
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	667 add_to_fcn_map (di, at_end);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	668
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	669 add_to_private_fcn_map (di);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	670
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	671 add_to_method_map (di, at_end);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	672
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	673 if (add_hook)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	674 add_hook (dir);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	675 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	676 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	677 else if (warn)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	678 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	679 }
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	680 else if (warn)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	681 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	682 std::string msg = fs.error ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	683 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	684 }
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	685 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	686
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	687 // FIXME -- is there a better way to do this?
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	688
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	689 i = find_dir_info (".");
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	690
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	691 if (i != dir_info_list.end ())
5871 b9fd54407c8d [project @ 2006-06-30 16:48:39 by jwe] jwe parents: 5867 diff changeset	692 move (i, false);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	693 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	694
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	695 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	696 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	697 const string_vector& fcn_files)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	698 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	699 octave_idx_type len = fcn_files.length ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	700
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	701 for (octave_idx_type k = 0; k < len; k++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	702 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	703 std::string fname = fcn_files[k];
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	704
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	705 std::string ext;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	706 std::string base = fname;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	707
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	708 size_t pos = fname.rfind ('.');
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	709
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	710 if (pos != std::string::npos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	711 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	712 base = fname.substr (0, pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	713 ext = fname.substr (pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	714 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	715
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	716 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	717
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	718 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	719 p != file_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	720 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	721 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	722 if (p->dir_name == dir)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	723 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	724 file_info_list.erase (p);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	725
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	726 if (file_info_list.empty ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	727 fcn_map.erase (fname);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	728
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	729 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	730 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	731 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	732 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	733 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	734
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	735 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	736 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	737 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	738 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	739
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	740 if (p != private_fcn_map.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	741 private_fcn_map.erase (p);
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
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	744 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	745 load_path::remove_method_map (const std::string& dir)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	746 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	747 for (method_map_iterator i = method_map.begin ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	748 i != method_map.end ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	749 i++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	750 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	751 std::string class_name = i->first;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	752
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	753 fcn_map_type& fm = i->second;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	754
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	755 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	756
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	757 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	758 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	759 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	760
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	761 if (file_info_list.size () == 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	762 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	763 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	764 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	765 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	766 p != file_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	767 p++)
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 if (p->dir_name == full_dir_name)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	770 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	771 file_info_list.erase (p);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	772
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	773 // FIXME -- if there are no other elements, we
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	774 // should remove this element of fm but calling
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	775 // erase here would invalidate the iterator q.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	776
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	777 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	778 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	779 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	780 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	781 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	782 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	783 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	784
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	785 bool
5919 ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	786 load_path::do_remove (const std::string& dir_arg)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	787 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	788 bool retval = false;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	789
5919 ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	790 if (! dir_arg.empty ())
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	791 {
5919 ceaf10a4743c [project @ 2006-08-14 16:42:02 by jwe] jwe parents: 5911 diff changeset	792 if (dir_arg == ".")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	793 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	794 warning ("rmpath: can't remove \".\" from path");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	795
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	796 // Avoid additional warnings.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	797 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	798 }
5867 b305874f50ef [project @ 2006-06-28 22:11:51 by jwe] jwe parents: 5864 diff changeset	799 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	800 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	801 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	802
11578 06cfda4c07e5 load_path::do_add, load_path::do_remove: strip trailing directory separators John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	803 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	804
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	805 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	806
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	807 if (i != dir_info_list.end ())
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 retval = true;
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 if (remove_hook)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	812 remove_hook (dir);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	813
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	814 string_vector fcn_files = i->fcn_files;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	815
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	816 dir_info_list.erase (i);
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 remove_fcn_map (dir, fcn_files);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	819
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	820 remove_private_fcn_map (dir);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	821
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	822 remove_method_map (dir);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	823 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	824 }
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
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	827 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	828 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	829
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	830 void
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	831 load_path::do_update (void) const
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	832 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	833 // 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	834 // preserve the correct directory ordering for new files that
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	835 // have appeared.
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	836
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	837 fcn_map.clear ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	838
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	839 private_fcn_map.clear ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	840
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	841 method_map.clear ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	842
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	843 for (dir_info_list_iterator p = dir_info_list.begin ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	844 p != dir_info_list.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	845 p++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	846 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	847 dir_info& di = *p;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	848
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	849 di.update ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	850
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	851 add_to_fcn_map (di, true);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	852
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	853 add_to_private_fcn_map (di);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	854
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	855 add_to_method_map (di, true);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	856 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	857 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	858
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	859 bool
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	860 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	861 const std::string& fcn, const char *who)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	862 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	863 bool retval = false;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	864
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	865 if (type == load_path::OCT_FILE)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	866 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	867 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	868 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	869 fname += ".oct";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	870 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	871 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	872 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	873 else if (type == load_path::M_FILE)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	874 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	875 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	876 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	877 fname += ".m";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	878 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	879 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	880 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	881 else if (type == load_path::MEX_FILE)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	882 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	883 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	884 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	885 fname += ".mex";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	886 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	887 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	888 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	889 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	890 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	891 if (possible_types & load_path::OCT_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	892 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	893 fname += ".oct";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	894 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	895 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	896 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	897 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	898 fname += ".m";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	899 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	900 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	901 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	902 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	903 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	904 if (possible_types & load_path::MEX_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	905 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	906 fname += ".mex";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	907 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	908 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	909 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	910 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	911 fname += ".m";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	912 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	913 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	914 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	915 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	916 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	917 if (possible_types & load_path::OCT_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	918 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	919 fname += ".oct";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	920 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	921 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	922 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	923 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	924 fname += ".mex";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	925 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	926 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	927 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	928 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	929 \| load_path::MEX_FILE))
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	930 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	931 if (possible_types & load_path::OCT_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	932 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	933 fname += ".oct";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	934 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	935 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	936 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	937 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	938 fname += ".mex";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	939 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	940 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	941 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	942 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	943 fname += ".m";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	944 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	945 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	946 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	947 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	948 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	949
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	950 return retval;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11578 diff changeset	951 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	952
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	953 std::string
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	954 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	955 int type) const
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	956 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	957 std::string retval;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11578 diff changeset	958
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	959 // update ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	960
8593 4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	961 if (fcn.length () > 0 && fcn[0] == '@')
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	962 {
8593 4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	963 size_t pos = fcn.find ('/');
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	964
8593 4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	965 if (pos != std::string::npos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	966 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	967 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	968 std::string meth = fcn.substr (pos+1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	969
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	970 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	971 }
8593 4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	972 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	973 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	974 }
4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	975 else
4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	976 {
4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	977 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	978
4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	979 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	980
4e39b00218d3 load-path.cc (load_path::do_find_fcn): handle @foo/bar John W. Eaton <jwe@octave.org> parents: 8586 diff changeset	981 if (p != fcn_map.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	982 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	983 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	984
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	985 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	986 i != file_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	987 i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	988 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	989 const file_info& fi = *i;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	990
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	991 retval = file_ops::concat (fi.dir_name, fcn);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	992
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	993 if (check_file_type (retval, type, fi.types,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	994 fcn, "load_path::do_find_fcn"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	995 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	996 dir_name = fi.dir_name;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	997 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	998 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	999 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1000 retval = std::string ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1001 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1002 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1003 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1004
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1005 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1006 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1007
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1008 std::string
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1009 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	1010 const std::string& fcn, int type) const
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1011 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1012 std::string retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1013
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1014 // update ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1015
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1016 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	1017
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1018 if (q != private_fcn_map.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1019 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1020 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	1021
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1022 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	1023
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1024 if (p != m.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1025 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1026 std::string fname
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1027 = 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	1028
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1029 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	1030 "load_path::find_private_fcn"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1031 retval = fname;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1032 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1033 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1034
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1035 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1036 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1037
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1038 std::string
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1039 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	1040 const std::string& meth,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1041 std::string& dir_name, int type) const
7336 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 std::string 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 // update ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1046
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1047 dir_name = std::string ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1048
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1049 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	1050
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1051 if (q != method_map.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1052 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1053 const fcn_map_type& m = q->second;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1054
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1055 const_fcn_map_iterator p = m.find (meth);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1056
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9458 diff changeset	1057 if (p != m.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1058 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1059 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	1060
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1061 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	1062 i != file_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1063 i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1064 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1065 const file_info& fi = *i;
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 retval = file_ops::concat (fi.dir_name, meth);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1068
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1069 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	1070 meth, "load_path::do_find_method");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1071
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1072 if (found)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1073 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1074 dir_name = fi.dir_name;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1075 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1076 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1077 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1078 retval = std::string ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1079 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1080 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1081 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1082
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1083 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1084 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1085
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1086 std::list<std::string>
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1087 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	1088 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1089 std::list<std::string> retval;
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 // update ();
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_method_map_iterator q = method_map.find (class_name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1094
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1095 if (q != method_map.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1096 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1097 const fcn_map_type& m = q->second;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1098
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1099 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	1100 retval.push_back (p->first);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1101 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1102
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1103 if (! retval.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1104 retval.sort ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1105
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1106 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1107 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1108
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1109 std::list<std::string>
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1110 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	1111 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1112 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	1113
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1114 // update ();
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1115
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1116 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	1117 q != method_map.end (); q++)
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1118 {
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1119 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	1120
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1121 if (m.find (meth) != m.end ())
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1122 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	1123 }
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1124
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1125 return retval;
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1126 }
0c7d84a65386 allow taking handles of methods with no base overload Jaroslav Hajek <highegg@gmail.com> parents: 9401 diff changeset	1127
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1128 std::string
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1129 load_path::do_find_file (const std::string& file) const
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1130 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1131 std::string retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1132
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	1133 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	1134 {
6838 5e3350bdd91d [project @ 2007-08-28 02:59:58 by jwe] jwe parents: 6825 diff changeset	1135 if (octave_env::absolute_pathname (file)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1136 \|\| octave_env::rooted_relative_pathname (file))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1137 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1138 file_stat fs (file);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1139
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1140 if (fs.exists ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1141 return file;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1142 }
6838 5e3350bdd91d [project @ 2007-08-28 02:59:58 by jwe] jwe parents: 6825 diff changeset	1143 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1144 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1145 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	1146 p != dir_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1147 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1148 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1149 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	1150
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1151 file_stat fs (tfile);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1152
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1153 if (fs.exists ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1154 return tfile;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1155 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1156 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1157 }
6838 5e3350bdd91d [project @ 2007-08-28 02:59:58 by jwe] jwe parents: 6825 diff changeset	1158 else
5e3350bdd91d [project @ 2007-08-28 02:59:58 by jwe] jwe parents: 6825 diff changeset	1159 {
5e3350bdd91d [project @ 2007-08-28 02:59:58 by jwe] jwe parents: 6825 diff changeset	1160 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	1161 p != dir_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1162 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1163 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1164 string_vector all_files = p->all_files;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1165
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1166 octave_idx_type len = all_files.length ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1167
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1168 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	1169 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1170 if (all_files[i] == file)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1171 return file_ops::concat (p->dir_name, file);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1172 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1173 }
6838 5e3350bdd91d [project @ 2007-08-28 02:59:58 by jwe] jwe parents: 6825 diff changeset	1174 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1175
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1176 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1177 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1178
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1179 std::string
8041 a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1180 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	1181 {
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1182 std::string retval;
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1183
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1184 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	1185 && (octave_env::absolute_pathname (dir)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1186 \|\| 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	1187 {
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1188 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	1189
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1190 if (fs.exists () && fs.is_dir ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1191 return dir;
8041 a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1192 }
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1193 else
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1194 {
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1195 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	1196 p != dir_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1197 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1198 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1199 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	1200
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1201 size_t dname_len = dname.length ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1202
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1203 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	1204 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1205 dname = dname.substr (0, dname_len - 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1206 dname_len--;
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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1209 size_t dir_len = dir.length ();
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 if (dname_len >= dir_len
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1212 && 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	1213 && 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	1214 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1215 file_stat fs (p->dir_name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1216
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1217 if (fs.exists () && fs.is_dir ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1218 return p->dir_name;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1219 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1220 }
8041 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
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1223 return retval;
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1224 }
a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1225
9806 8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1226 string_vector
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1227 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	1228 {
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1229 std::list<std::string> retlist;
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1230
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1231 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	1232 && (octave_env::absolute_pathname (dir)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1233 \|\| octave_env::rooted_relative_pathname (dir)))
9806 8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1234 {
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1235 file_stat fs (dir);
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1236
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1237 if (fs.exists () && fs.is_dir ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1238 retlist.push_back (dir);
9806 8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1239 }
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1240 else
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1241 {
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1242 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	1243 p != dir_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1244 p++)
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 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	1247
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1248 size_t dname_len = dname.length ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1249
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1250 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	1251 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1252 dname = dname.substr (0, dname_len - 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1253 dname_len--;
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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1256 size_t dir_len = dir.length ();
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 if (dname_len >= dir_len
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1259 && 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	1260 && 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	1261 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1262 file_stat fs (p->dir_name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1263
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1264 if (fs.exists () && fs.is_dir ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1265 retlist.push_back (p->dir_name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1266 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1267 }
9806 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
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1270 return retlist;
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1271 }
8e345f2fe4d6 improved support for Contents.m files John W. Eaton <jwe@octave.org> parents: 9764 diff changeset	1272
8041 a14bdf90be55 Add a search for Contents.m files to the help function David Bateman <dbateman@free.fr> parents: 8021 diff changeset	1273 std::string
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1274 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	1275 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1276 std::string retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1277
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1278 std::string dir_name;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1279 std::string file_name;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1280
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1281 octave_idx_type flen = flist.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1282 octave_idx_type rel_flen = 0;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1283
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1284 string_vector rel_flist (flen);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1285
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1286 for (octave_idx_type i = 0; i < flen; i++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1287 {
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	1288 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	1289
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1290 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	1291 {
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	1292 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	1293 \|\| 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	1294 {
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1295 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	1296
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1297 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	1298 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	1299 }
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1300 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	1301 {
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1302 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	1303 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	1304 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	1305 {
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1306 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	1307
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1308 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	1309
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1310 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	1311 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	1312 }
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1313 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1314 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1315 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	1316 rel_flist[rel_flen++] = file;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1317 }
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 rel_flist.resize (rel_flen);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1320
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1321 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	1322 p != dir_info_list.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1323 p++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1324 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1325 string_vector all_files = p->all_files;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1326
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1327 octave_idx_type len = all_files.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1328
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1329 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	1330 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1331 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	1332 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1333 if (all_files[i] == rel_flist[j])
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1334 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1335 dir_name = p->dir_name;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1336 file_name = rel_flist[j];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1337
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1338 goto done;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1339 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1340 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1341 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1342 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1343
6159 645605133a6f [project @ 2006-11-14 02:55:05 by jwe] jwe parents: 6149 diff changeset	1344 done:
645605133a6f [project @ 2006-11-14 02:55:05 by jwe] jwe parents: 6149 diff changeset	1345
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1346 if (! dir_name.empty ())
7272 05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe] jwe parents: 7017 diff changeset	1347 retval = file_ops::concat (dir_name, file_name);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1348
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1349 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1350 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1351
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1352 string_vector
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1353 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	1354 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1355 std::list<std::string> retlist;
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 std::string dir_name;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1358 std::string file_name;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1359
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1360 octave_idx_type flen = flist.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1361 octave_idx_type rel_flen = 0;
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 rel_flist (flen);
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 for (octave_idx_type i = 0; i < flen; i++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1366 {
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	1367 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	1368
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1369 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	1370 {
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	1371 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	1372 \|\| 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	1373 {
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1374 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	1375
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1376 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	1377 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	1378 }
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1379 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	1380 {
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1381 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	1382 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	1383 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	1384 {
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1385 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	1386
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1387 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	1388
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1389 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	1390 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	1391 }
a6ab46b5926f load_path::do_find{all,}first_of: search path for relative file names John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	1392 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1393 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1394 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	1395 rel_flist[rel_flen++] = file;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1396 }
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 rel_flist.resize (rel_flen);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1399
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1400 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	1401 p != dir_info_list.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1402 p++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1403 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1404 string_vector all_files = p->all_files;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1405
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1406 octave_idx_type len = all_files.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1407
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1408 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	1409 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1410 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	1411 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1412 if (all_files[i] == rel_flist[j])
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1413 retlist.push_back
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1414 (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	1415 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1416 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1417 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1418
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	1419 return retlist;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1420 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1421
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1422 string_vector
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1423 load_path::do_dirs (void) const
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1424 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1425 size_t len = dir_info_list.size ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1426
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1427 string_vector retval (len);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1428
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1429 octave_idx_type k = 0;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1430
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1431 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	1432 i != dir_info_list.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1433 i++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1434 retval[k++] = i->dir_name;
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 return retval;
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
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1439 std::list<std::string>
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1440 load_path::do_dir_list (void) const
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 std::list<std::string> retval;
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 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	1445 i != dir_info_list.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1446 i++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1447 retval.push_back (i->dir_name);
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1448
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1449 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1450 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1451
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1452 string_vector
9261 95445f9f5976 omit file extensions from __list_functions__ output John W. Eaton <jwe@octave.org> parents: 9105 diff changeset	1453 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	1454 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1455 string_vector retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1456
9282 2ed8d2d92507 load_path::do_files: avoid shadow warning from GCC John W. Eaton <jwe@octave.org> parents: 9261 diff changeset	1457 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	1458
9282 2ed8d2d92507 load_path::do_files: avoid shadow warning from GCC John W. Eaton <jwe@octave.org> parents: 9261 diff changeset	1459 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	1460 retval = p->fcn_files;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1461
9261 95445f9f5976 omit file extensions from __list_functions__ output John W. Eaton <jwe@octave.org> parents: 9105 diff changeset	1462 if (omit_exts)
95445f9f5976 omit file extensions from __list_functions__ output John W. Eaton <jwe@octave.org> parents: 9105 diff changeset	1463 {
95445f9f5976 omit file extensions from __list_functions__ output John W. Eaton <jwe@octave.org> parents: 9105 diff changeset	1464 octave_idx_type len = retval.length ();
95445f9f5976 omit file extensions from __list_functions__ output John W. Eaton <jwe@octave.org> parents: 9105 diff changeset	1465
95445f9f5976 omit file extensions from __list_functions__ output John W. Eaton <jwe@octave.org> parents: 9105 diff changeset	1466 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	1467 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1468 std::string fname = retval[i];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1469
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1470 size_t pos = fname.rfind ('.');
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1471
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1472 if (pos != std::string::npos)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1473 retval[i] = fname.substr (0, pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1474 }
9261 95445f9f5976 omit file extensions from __list_functions__ output John W. Eaton <jwe@octave.org> parents: 9105 diff changeset	1475 }
95445f9f5976 omit file extensions from __list_functions__ output John W. Eaton <jwe@octave.org> parents: 9105 diff changeset	1476
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1477 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1478 }
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 string_vector
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1481 load_path::do_fcn_names (void) const
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1482 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1483 size_t len = fcn_map.size ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1484
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1485 string_vector retval (len);
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 octave_idx_type count = 0;
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 for (const_fcn_map_iterator p = fcn_map.begin ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1490 p != fcn_map.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1491 p++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1492 retval[count++] = p->first;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1493
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1494 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1495 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1496
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1497 std::string
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1498 load_path::do_path (void) const
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1499 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1500 std::string xpath;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1501
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1502 string_vector xdirs = load_path::dirs ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1503
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1504 octave_idx_type len = xdirs.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1505
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1506 if (len > 0)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1507 xpath = xdirs[0];
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1508
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1509 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	1510 xpath += dir_path::path_sep_str () + xdirs[i];
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1511
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1512 return xpath;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1513 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1514
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1515 void
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1516 print_types (std::ostream& os, int types)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1517 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1518 bool printed_type = false;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1519
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1520 if (types & load_path::OCT_FILE)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1521 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1522 os << "oct";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1523 printed_type = true;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1524 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1525
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1526 if (types & load_path::MEX_FILE)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1527 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1528 if (printed_type)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1529 os << "\|";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1530 os << "mex";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1531 printed_type = true;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1532 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1533
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1534 if (types & load_path::M_FILE)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1535 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1536 if (printed_type)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1537 os << "\|";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1538 os << "m";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1539 printed_type = true;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1540 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1541 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1542
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1543 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1544 print_fcn_list (std::ostream& os,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1545 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	1546 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1547 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	1548 p != lst.end ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1549 p++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1550 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1551 os << " " << p->first << " (";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1552
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1553 print_types (os, p->second);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1554
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1555 os << ")\n";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1556 }
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
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1559 string_vector
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1560 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	1561 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1562 octave_idx_type n = lst.size ();
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 string_vector retval (n);
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 octave_idx_type count = 0;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1567
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1568 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	1569 p != lst.end ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1570 p++)
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 std::string nm = p->first;
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 int types = p->second;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1575
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1576 if (types & load_path::OCT_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1577 nm += ".oct";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1578 else if (types & load_path::MEX_FILE)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1579 nm += ".mex";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1580 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1581 nm += ".m";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1582
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1583 retval[count++] = nm;
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
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1586 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1587 }
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 void
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1590 load_path::do_display (std::ostream& os) const
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1591 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1592 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	1593 i != dir_info_list.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1594 i++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1595 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1596 string_vector fcn_files = i->fcn_files;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1597
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1598 if (! fcn_files.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1599 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1600 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	1601
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1602 fcn_files.list_in_columns (os);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1603 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1604
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1605 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	1606 = i->method_file_map;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1607
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1608 if (! method_file_map.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1609 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1610 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	1611 p != method_file_map.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1612 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1613 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1614 os << "\n*** methods in " << i->dir_name
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1615 << "/@" << p->first << ":\n\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1616
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1617 const dir_info::class_info& ci = p->second;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1618
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1619 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	1620
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1621 method_files.list_in_columns (os);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1622 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1623 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1624 }
5864 e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe] jwe parents: 5854 diff changeset	1625
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1626 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	1627 i != private_fcn_map.end (); i++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1628 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1629 os << "\n*** private functions in "
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1630 << file_ops::concat (i->first, "private") << ":\n\n";
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1631
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1632 print_fcn_list (os, i->second);
5832 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
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1635 #if defined (DEBUG_LOAD_PATH)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1636
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1637 for (const_fcn_map_iterator i = fcn_map.begin ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1638 i != fcn_map.end ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1639 i++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1640 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1641 os << i->first << ":\n";
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 file_info_list_type& file_info_list = i->second;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1644
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1645 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	1646 p != file_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1647 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1648 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1649 os << " " << p->dir_name << " (";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1650
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1651 print_types (os, p->types);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1652
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1653 os << ")\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1654 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1655 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1656
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1657 for (const_method_map_iterator i = method_map.begin ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1658 i != method_map.end ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1659 i++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1660 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1661 os << "CLASS " << i->first << ":\n";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1662
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1663 const fcn_map_type& fm = i->second;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1664
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1665 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	1666 q != fm.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1667 q++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1668 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1669 os << " " << q->first << ":\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1670
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1671 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	1672
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1673 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	1674 p != file_info_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1675 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1676 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1677 os << " " << p->dir_name << " (";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1678
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1679 print_types (os, p->types);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1680
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1681 os << ")\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1682 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1683 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1684 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1685
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1686 os << "\n";
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1687
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1688 #endif
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1689 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1690
10334 db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1691 // 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	1692 static bool
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1693 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	1694 {
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1695 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	1696 char psc = dir_path::path_sep_char ();
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1697 while (pos != std::string::npos)
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1698 {
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1699 if ((pos == 0 \|\| path_list[pos-1] == psc)
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1700 && (pos + ps == pls \|\| path_list[pos + ps] == psc))
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1701 return true;
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1702 else
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1703 pos = path_list.find (path, pos + 1);
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1704 }
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1705
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1706 return false;
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1707 }
db540cb0e959 improve shadowed function checking Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	1708
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1709 void
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1710 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	1711 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1712 std::string dir_name = di.dir_name;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1713
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1714 string_vector fcn_files = di.fcn_files;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1715
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1716 octave_idx_type len = fcn_files.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1717
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1718 for (octave_idx_type i = 0; i < len; i++)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1719 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1720 std::string fname = fcn_files[i];
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1721
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1722 std::string ext;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1723 std::string base = fname;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1724
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1725 size_t pos = fname.rfind ('.');
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1726
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	1727 if (pos != std::string::npos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1728 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1729 base = fname.substr (0, pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1730 ext = fname.substr (pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1731 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1732
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1733 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	1734
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1735 file_info_list_iterator p = file_info_list.begin ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1736
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1737 while (p != file_info_list.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1738 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1739 if (p->dir_name == dir_name)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1740 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1741
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1742 p++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1743 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1744
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1745 int t = 0;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1746 if (ext == ".m")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1747 t = load_path::M_FILE;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1748 else if (ext == ".oct")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1749 t = load_path::OCT_FILE;
5864 e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe] jwe parents: 5854 diff changeset	1750 else if (ext == ".mex")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1751 t = load_path::MEX_FILE;
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1752
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1753 if (p == file_info_list.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1754 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1755 file_info fi (dir_name, t);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1756
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1757 if (at_end)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1758 file_info_list.push_back (fi);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1759 else
10242 4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1760 {
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1761 // 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	1762
10242 4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1763 if (! file_info_list.empty ())
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1764 {
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1765 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	1766
ba932ad87a04 load_path::add_to_fcn_map: style fixes John W. Eaton <jwe@octave.org> parents: 10334 diff changeset	1767 // 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	1768 // 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	1769 // partial matches?
ba932ad87a04 load_path::add_to_fcn_map: style fixes John W. Eaton <jwe@octave.org> parents: 10334 diff changeset	1770
ba932ad87a04 load_path::add_to_fcn_map: style fixes John W. Eaton <jwe@octave.org> parents: 10334 diff changeset	1771 if (sys_path.find (old.dir_name) != std::string::npos
ba932ad87a04 load_path::add_to_fcn_map: style fixes John W. Eaton <jwe@octave.org> parents: 10334 diff changeset	1772 && 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	1773 {
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1774 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	1775
10242 4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1776 warning_with_id ("Octave:shadowed-function",
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11578 diff changeset	1777 "function %s shadows a core library function",
10242 4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1778 fcn_path.c_str ());
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1779 }
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1780 }
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1781 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	1782 {
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1783 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	1784 warning_with_id ("Octave:shadowed-function",
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11578 diff changeset	1785 "function %s shadows a built-in function",
10242 4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1786 fcn_path.c_str ());
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1787 }
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1788
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1789 file_info_list.push_front (fi);
4acae5e46738 warn when core functions are shadowed Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1790 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1791 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1792 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1793 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1794 file_info& fi = *p;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1795
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1796 fi.types \|= t;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1797 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1798 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1799 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1800
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1801 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1802 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	1803 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1804 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	1805
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1806 if (! private_file_map.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1807 private_fcn_map[di.dir_name] = private_file_map;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1808 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1809
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1810 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1811 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	1812 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1813 std::string dir_name = di.dir_name;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1814
7971 dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	1815 // <CLASS_NAME, CLASS_INFO>
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1816 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	1817
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1818 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	1819 q != method_file_map.end ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1820 q++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1821 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1822 std::string class_name = q->first;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1823
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1824 fcn_map_type& fm = method_map[class_name];
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1825
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1826 std::string full_dir_name
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1827 = file_ops::concat (dir_name, "@" + class_name);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1828
7971 dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	1829 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	1830
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1831 // <FCN_NAME, TYPES>
7971 dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	1832 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	1833
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1834 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	1835 p != m.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1836 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 std::string base = p->first;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1839
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1840 int types = p->second;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1841
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1842 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	1843
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1844 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	1845
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1846 while (p2 != file_info_list.end ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1847 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1848 if (p2->dir_name == full_dir_name)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1849 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1850
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1851 p2++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1852 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1853
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1854 if (p2 == file_info_list.end ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1855 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1856 file_info fi (full_dir_name, types);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1857
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1858 if (at_end)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1859 file_info_list.push_back (fi);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1860 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1861 file_info_list.push_front (fi);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1862 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1863 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1864 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1865 // FIXME -- is this possible?
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1866
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1867 file_info& fi = *p2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1868
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1869 fi.types = types;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1870 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1871 }
7971 dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	1872
dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	1873 // <FCN_NAME, TYPES>
dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	1874 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	1875
dd5cc5016487 handle private functions in class directories John W. Eaton <jwe@octave.org> parents: 7786 diff changeset	1876 if (! private_file_map.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1877 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	1878 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1879 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7272 diff changeset	1880
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1881 std::string
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1882 genpath (const std::string& dirname, const string_vector& skip)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1883 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1884 std::string retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1885
5871 b9fd54407c8d [project @ 2006-06-30 16:48:39 by jwe] jwe parents: 5867 diff changeset	1886 dir_entry dir (dirname);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1887
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1888 if (dir)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1889 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1890 retval = dirname;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1891
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1892 string_vector dirlist = dir.read ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11578 diff changeset	1893
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1894 octave_idx_type len = dirlist.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1895
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1896 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	1897 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1898 std::string elt = dirlist[i];
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 bool skip_p = (elt == "." \|\| elt == ".." \|\| elt[0] == '@');
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1901
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1902 if (! skip_p)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1903 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1904 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	1905 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1906 skip_p = (elt == skip[j]);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1907 if (skip_p)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1908 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1909 }
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 if (! skip_p)
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 std::string nm = file_ops::concat (dirname, elt);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1914
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1915 file_stat fs (nm);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1916
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1917 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	1918 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	1919 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1920 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1921 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1922 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1923
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1924 return retval;
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
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1927 static void
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1928 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	1929 const std::string& script_file)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1930 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1931 if (! octave_interpreter_ready)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1932 return;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1933
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9807 diff changeset	1934 unwind_protect frame;
2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9807 diff changeset	1935
2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9807 diff changeset	1936 frame.protect_var (input_from_startup_file);
5832 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 input_from_startup_file = true;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1939
7272 05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe] jwe parents: 7017 diff changeset	1940 std::string file = file_ops::concat (dir, script_file);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1941
5978 32cef2cfc9c9 [project @ 2006-08-31 02:31:57 by jwe] jwe parents: 5975 diff changeset	1942 file_stat fs (file);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1943
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1944 if (fs.exists ())
5975 e64059303a6f [project @ 2006-08-29 16:37:39 by jwe] jwe parents: 5919 diff changeset	1945 source_file (file, "base");
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1946 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1947
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1948 void
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1949 execute_pkg_add (const std::string& dir)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1950 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1951 execute_pkg_add_or_del (dir, "PKG_ADD");
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1952 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1953
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1954 void
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1955 execute_pkg_del (const std::string& dir)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1956 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1957 execute_pkg_add_or_del (dir, "PKG_DEL");
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1958 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1959
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1960 DEFUN (genpath, args, ,
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1961 "-- texinfo --\n\
11572 7d6d8c1e471f Grammarcheck Texinfo for files in src directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	1962 @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	1963 @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	1964 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	1965 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	1966 exclude directories with those names.\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1967 @end deftypefn")
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 octave_value retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1970
10971 386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	1971 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	1972
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	1973 if (nargin == 1)
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1974 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1975 std::string dirname = args(0).string_value ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1976
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1977 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1978 retval = genpath (dirname);
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1979 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12438 diff changeset	1980 error ("genpath: DIR must be a character string");
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	1981 }
10971 386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	1982 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	1983 {
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	1984 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	1985
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	1986 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	1987
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	1988 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	1989 {
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	1990 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	1991
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	1992 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	1993 break;
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	1994 }
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	1995
386aa01ca84c genpath: accept additional arguments as names of directories to skip Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 10957 diff changeset	1996 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	1997 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	1998 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12438 diff changeset	1999 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	2000 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2001 else
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2002 print_usage ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2003
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2004 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2005 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2006
9105 9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2007 static void
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2008 rehash_internal (void)
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2009 {
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2010 load_path::update ();
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2011
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2012 // 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	2013 // 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	2014
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2015 // 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	2016 Vlast_prompt_time.stamp ();
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2017 }
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2018
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2019 DEFUN (rehash, , ,
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2020 "-- texinfo --\n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2021 @deftypefn {Built-in Function} {} rehash ()\n\
6644 004561c38e8f [project @ 2007-05-21 20:59:26 by jwe] jwe parents: 6630 diff changeset	2022 Reinitialize Octave's load path directory cache.\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2023 @end deftypefn")
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2024 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2025 octave_value_list retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2026
9105 9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2027 rehash_internal ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2028
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2029 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2030 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2031
8609 fcf762ba66cf load-path.cc (Fcommand_line_path): rename from Fcommandlinepath John W. Eaton <jwe@octave.org> parents: 8593 diff changeset	2032 DEFUN (command_line_path, , ,
8586 31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2033 "-- texinfo --\n\
8609 fcf762ba66cf load-path.cc (Fcommand_line_path): rename from Fcommandlinepath John W. Eaton <jwe@octave.org> parents: 8593 diff changeset	2034 @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	2035 Return the command line path variable.\n\
31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2036 \n\
31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2037 @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	2038 @end deftypefn")
31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2039 {
31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2040 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	2041 }
31ab3b83bc8a savepath: Respect cmd-line and env paths. Ben Abbott <bpabbott@mac.com> parents: 8511 diff changeset	2042
7391 f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2043 DEFUN (restoredefaultpath, , ,
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2044 "-- texinfo --\n\
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2045 @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	2046 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	2047 \n\
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2048 @seealso{path, addpath, rmpath, genpath, pathdef, savepath, pathsep}\n\
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2049 @end deftypefn")
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2050 {
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2051 load_path::initialize (true);
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2052
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2053 return octave_value (load_path::system_path ());
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2054 }
f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2055
8812 7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8746 diff changeset	2056 // 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	2057 // 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	2058 // 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	2059 // ~/.octaverc file
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8746 diff changeset	2060
7391 f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2061 DEFUN (__pathorig__, , ,
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2062 "-- texinfo --\n\
7391 f071480b7eac [project @ 2008-01-17 07:50:33 by jwe] jwe parents: 7374 diff changeset	2063 @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	2064 Undocumented internal function.\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2065 @end deftypefn")
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2066 {
6630 0fcc8d65b571 [project @ 2007-05-16 15:32:09 by jwe] jwe parents: 6626 diff changeset	2067 return octave_value (load_path::system_path ());
5832 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
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2070 DEFUN (path, args, nargout,
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2071 "-- texinfo --\n\
6678 49724abe1236 [project @ 2007-05-31 19:44:45 by jwe] jwe parents: 6644 diff changeset	2072 @deftypefn {Built-in Function} {} path (@dots{})\n\
6644 004561c38e8f [project @ 2007-05-21 20:59:26 by jwe] jwe parents: 6630 diff changeset	2073 Modify or display Octave's load path.\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2074 \n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2075 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	2076 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	2077 \n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2078 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	2079 current load path.\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2080 \n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2081 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	2082 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	2083 to the result and return it.\n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2084 \n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2085 No checks are made for duplicate elements.\n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2086 @seealso{addpath, rmpath, genpath, pathdef, savepath, pathsep}\n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2087 @end deftypefn")
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2088 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2089 octave_value retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2090
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2091 int argc = args.length () + 1;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2092
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2093 string_vector argv = args.make_argv ("path");
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2094
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2095 if (! error_state)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2096 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2097 if (argc > 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2098 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2099 std::string path = argv[1];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2100
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2101 for (int i = 2; i < argc; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2102 path += dir_path::path_sep_str () + argv[i];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2103
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2104 load_path::set (path, true);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2105
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2106 rehash_internal ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2107 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2108
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2109 if (nargout > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2110 retval = load_path::path ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2111 else if (argc == 1 && nargout == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2112 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2113 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	2114
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2115 string_vector dirs = load_path::dirs ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2116
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2117 dirs.list_in_columns (octave_stdout);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2118
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2119 octave_stdout << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2120 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2121 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2122
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2123 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2124 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2125
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8704 diff changeset	2126 DEFUN (addpath, args, nargout,
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2127 "-- texinfo --\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10521 diff changeset	2128 @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	2129 @deftypefnx {Built-in Function} {} addpath (@var{dir1}, @dots{}, @var{option})\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2130 Add @var{dir1}, @dots{} to the current function search path. If\n\
12632 2dbac27e0e40 doc: miscellaneous touch-ups to documentation strings Rik <octave@nomad.inbox5.com> parents: 12601 diff changeset	2131 @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	2132 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	2133 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	2134 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	2135 \n\
1cbfb15892c9 addpath, rmpath: document path arguments John W. Eaton <jwe@octave.org> parents: 10971 diff changeset	2136 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	2137 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	2138 \n\
1cbfb15892c9 addpath, rmpath: document path arguments John W. Eaton <jwe@octave.org> parents: 10971 diff changeset	2139 @example\n\
1cbfb15892c9 addpath, rmpath: document path arguments John W. Eaton <jwe@octave.org> parents: 10971 diff changeset	2140 addpath (\"dir1:/dir2:~/dir3\");\n\
1cbfb15892c9 addpath, rmpath: document path arguments John W. Eaton <jwe@octave.org> parents: 10971 diff changeset	2141 @end example\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2142 @seealso{path, rmpath, genpath, pathdef, savepath, pathsep}\n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2143 @end deftypefn")
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2144 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2145 octave_value retval;
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 // Originally written by Bill Denney and Etienne Grossman. Heavily
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2148 // modified and translated to C++ by jwe.
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2149
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2150 if (nargout > 0)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2151 retval = load_path::path ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2152
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2153 int nargin = args.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2154
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2155 if (nargin > 0)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2156 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2157 bool append = false;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2158
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2159 octave_value option_arg = args(nargin-1);
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 if (option_arg.is_string ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2162 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2163 std::string option = option_arg.string_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2164
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2165 if (option == "-end")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2166 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2167 append = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2168 nargin--;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2169 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2170 else if (option == "-begin")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2171 nargin--;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2172 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2173 else if (option_arg.is_numeric_type ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2174 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2175 int val = option_arg.int_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2176
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2177 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2178 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2179 if (val == 0)
10957 27efbc0733f2 addpath: accept numeric option arguments as documented John W. Eaton <jwe@octave.org> parents: 10907 diff changeset	2180 nargin--;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2181 else if (val == 1)
10957 27efbc0733f2 addpath: accept numeric option arguments as documented John W. Eaton <jwe@octave.org> parents: 10907 diff changeset	2182 {
27efbc0733f2 addpath: accept numeric option arguments as documented John W. Eaton <jwe@octave.org> parents: 10907 diff changeset	2183 append = true;
27efbc0733f2 addpath: accept numeric option arguments as documented John W. Eaton <jwe@octave.org> parents: 10907 diff changeset	2184 nargin--;
27efbc0733f2 addpath: accept numeric option arguments as documented John W. Eaton <jwe@octave.org> parents: 10907 diff changeset	2185 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2186 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2187 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2188 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	2189 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2190 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2191 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2192 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2193 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2194 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	2195 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2196 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2197 }
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2198
9105 9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2199 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	2200
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2201 for (int i = 0; i < nargin; i++)
10315 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 std::string arg = args(i).string_value ();
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 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2206 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2207 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	2208
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2209 if (! append)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2210 std::reverse (dir_elts.begin (), dir_elts.end ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2211
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2212 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	2213 p != dir_elts.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2214 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2215 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2216 std::string dir = *p;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2217
11032 c9b0a75b02e8 Make all regexp in Octave compatible with both POSIX and PCRE. Rik <octave@nomad.inbox5.com> parents: 10982 diff changeset	2218 //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	2219 //dir = regexprep (dir, '/$', "");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2220
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2221 if (append)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2222 load_path::append (dir, true);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2223 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2224 load_path::prepend (dir, true);
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 need_to_update = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2227 }
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 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12438 diff changeset	2230 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	2231 }
9105 9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2232
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2233 if (need_to_update)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2234 rehash_internal ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2235 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2236 else
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2237 print_usage ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2238
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2239 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2240 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2241
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8704 diff changeset	2242 DEFUN (rmpath, args, nargout,
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2243 "-- texinfo --\n\
6678 49724abe1236 [project @ 2007-05-31 19:44:45 by jwe] jwe parents: 6644 diff changeset	2244 @deftypefn {Built-in Function} {} rmpath (@var{dir1}, @dots{})\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2245 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	2246 \n\
10980 1cbfb15892c9 addpath, rmpath: document path arguments John W. Eaton <jwe@octave.org> parents: 10971 diff changeset	2247 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	2248 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	2249 \n\
1cbfb15892c9 addpath, rmpath: document path arguments John W. Eaton <jwe@octave.org> parents: 10971 diff changeset	2250 @example\n\
1cbfb15892c9 addpath, rmpath: document path arguments John W. Eaton <jwe@octave.org> parents: 10971 diff changeset	2251 rmpath (\"dir1:/dir2:~/dir3\");\n\
1cbfb15892c9 addpath, rmpath: document path arguments John W. Eaton <jwe@octave.org> parents: 10971 diff changeset	2252 @end example\n\
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2253 @seealso{path, addpath, genpath, pathdef, savepath, pathsep}\n\
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2254 @end deftypefn")
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2255 {
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2256 // Originally by Etienne Grossmann. Heavily modified and translated
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2257 // to C++ by jwe.
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2258
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2259 octave_value retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2260
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2261 if (nargout > 0)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2262 retval = load_path::path ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2263
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2264 int nargin = args.length ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2265
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2266 if (nargin > 0)
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2267 {
9105 9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2268 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	2269
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2270 for (int i = 0; i < nargin; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2271 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2272 std::string arg = args(i).string_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2273
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2274 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2275 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2276 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	2277
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2278 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	2279 p != dir_elts.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2280 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2281 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2282 std::string dir = *p;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2283
11032 c9b0a75b02e8 Make all regexp in Octave compatible with both POSIX and PCRE. Rik <octave@nomad.inbox5.com> parents: 10982 diff changeset	2284 //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	2285 //dir = regexprep (dir, '/$', "");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2286
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2287 if (! load_path::remove (dir))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2288 warning ("rmpath: %s: not found", dir.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2289 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2290 need_to_update = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2291 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2292 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2293 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12438 diff changeset	2294 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	2295 }
9105 9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2296
9b12ed1fbbbd force rehash if path, addpath, or rmpath modify path John W. Eaton <jwe@octave.org> parents: 9010 diff changeset	2297 if (need_to_update)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2298 rehash_internal ();
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2299 }
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2300 else
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2301 print_usage ();
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2302
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2303 return retval;
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: diff changeset	2304 }

Mercurial > hg > octave-nkf

annotate src/load-path.cc @ 13983:7dd7cccf0757