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